[Pkg-owncloud-maintainers] Bug#1109996: unblock: nextcloud-desktop/3.16.6-3
Hefee
hefee at debian.org
Sun Jul 27 21:37:23 BST 2025
Package: release.debian.org
Severity: normal
X-Debbugs-Cc: nextcloud-desktop at packages.debian.org, hefee at debian.org
Control: affects -1 + src:nextcloud-desktop
User: release.debian.org at packages.debian.org
Usertags: unblock
Please unblock package nextcloud-desktop
[ Reason ]
Upstream release a new minor version of nextcloud-desktop with severl
bugfixes and updated translations.
Bugs fixed (baseurl for the #XXXX is https://github.com/nextcloud/desktop/pull/):
fix(migration): migrate general network settings. by @backportbot in #8308
fix(delete): fix move to trash in read-only folders by @backportbot in #8312
fix(gui): handle invalid file name edge case on Windows by @backportbot in #8314
fix(rename): avoid failing hard when rename is rejected by server by @backportbot in #8323
fix(readonly): enable MOVE rollback when folder is read-only by @backportbot in #8324
fix(readonly): apply ACL also to files inside read-only folders by @backportbot in #8325
fix(permissions): handle properly CanRead permission from server by @backportbot in #8327
fix(filesystem): only change folder permissions if required by @backportbot in #8328
fix(lockfilejobs): ensure using correct file path by @backportbot in #8332
fix(activitylistmodel): fix activities for e2ee files by @backportbot in #8378
fix(accountmanager): use defaults from configFile if setting was not present by @backportbot in #8380
fix(crash): debug builds would not try to remove a not found job by @backportbot in #8381
[ Impact ]
* Do not have uptodate translation is only annoying until misleading.
* The fixes for all those bugs were worth for upstream to backport all those
patchs, so I expect that server users are affected by this.
* Those fixes are mostly fixing corner-cases that are quite annoying when you hit them.
[ Tests ]
Uploaded this version to unstable, so others will test it. Have it running on
my laptop for some days without any issue so far. Additionally made sure, that
#1091614 is still fixed, as the patch didn't apply anymore.
Upstream also added tests for those fixes.
[ Risks ]
Low, the diff is not very big and the version is released by upstream without any suprises.
As this version is relead by upstream they also tested this version on a lot more users.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
Upstream takes their job serious in backporting only bugfixes and no new
features. I think it makes sense in this case to backport the complete version
including translations. The diff on the translations make the diff quite big :(
unblock nextcloud-desktop/3.16.6-3
-------------- next part --------------
diff -Nru nextcloud-desktop-3.16.4/admin/linux/build-appimage.sh nextcloud-desktop-3.16.6/admin/linux/build-appimage.sh
--- nextcloud-desktop-3.16.4/admin/linux/build-appimage.sh 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/admin/linux/build-appimage.sh 2025-06-18 22:57:35.000000000 +0200
@@ -49,9 +49,9 @@
[ -d usr/lib/x86_64-linux-gnu ] && mv usr/lib/x86_64-linux-gnu/* usr/lib/
-mkdir usr/plugins
-mv usr/lib64/*sync_vfs_suffix.so usr/plugins || mv usr/lib/*sync_vfs_suffix.so usr/plugins
-mv usr/lib64/*sync_vfs_xattr.so usr/plugins || mv usr/lib/*sync_vfs_xattr.so usr/plugins
+mkdir -p AppDir/usr/plugins
+mv usr/lib64/*sync_vfs_suffix.so AppDir/usr/plugins || mv usr/lib/*sync_vfs_suffix.so AppDir/usr/plugins
+mv usr/lib64/*sync_vfs_xattr.so AppDir/usr/plugins || mv usr/lib/*sync_vfs_xattr.so AppDir/usr/plugins
rm -rf usr/lib/cmake
rm -rf usr/include
@@ -63,6 +63,10 @@
rm -rf usr/share/nautilus-python/
rm -rf usr/share/nemo-python/
+# The client-specific data dir also contains the translations, we want to have those in the AppImage.
+mkdir -p AppDir/usr/share
+mv usr/share/${EXECUTABLE_NAME} AppDir/usr/share/${EXECUTABLE_NAME}
+
# Move sync exclude to right location
mv /app/etc/*/sync-exclude.lst usr/bin/
rm -rf etc
diff -Nru nextcloud-desktop-3.16.4/admin/osx/CMakeLists.txt nextcloud-desktop-3.16.6/admin/osx/CMakeLists.txt
--- nextcloud-desktop-3.16.4/admin/osx/CMakeLists.txt 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/admin/osx/CMakeLists.txt 2025-06-18 22:57:35.000000000 +0200
@@ -11,6 +11,7 @@
find_package(Qt${QT_VERSION_MAJOR} ${REQUIRED_QT_VERSION} COMPONENTS Core REQUIRED)
configure_file(create_mac.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
+configure_file(macosx.entitlements.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.entitlements)
configure_file(macosx.pkgproj.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh)
configure_file(post_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/post_install.sh)
diff -Nru nextcloud-desktop-3.16.4/admin/osx/mac-crafter/Sources/main.swift nextcloud-desktop-3.16.6/admin/osx/mac-crafter/Sources/main.swift
--- nextcloud-desktop-3.16.4/admin/osx/mac-crafter/Sources/main.swift 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/admin/osx/mac-crafter/Sources/main.swift 2025-06-18 22:57:35.000000000 +0200
@@ -244,7 +244,12 @@
let clientAppDir = "\(clientBuildDir)/image-\(buildType)-master/\(appName).app"
if let codeSignIdentity {
print("Code-signing Nextcloud Desktop Client libraries and frameworks...")
- try codesignClientAppBundle(at: clientAppDir, withCodeSignIdentity: codeSignIdentity)
+ let entitlementsPath = "\(clientBuildDir)/work/build/admin/osx/macosx.entitlements"
+ try codesignClientAppBundle(
+ at: clientAppDir,
+ withCodeSignIdentity: codeSignIdentity,
+ usingEntitlements: entitlementsPath
+ )
}
print("Placing Nextcloud Desktop Client in \(productPath)...")
@@ -286,11 +291,19 @@
@Option(name: [.short, .long], help: "Code signing identity for desktop client and libs.")
var codeSignIdentity: String
+ @Option(name: [.short, .long], help: "Entitlements to apply to the app bundle.")
+ var entitlementsPath: String?
+
mutating func run() throws {
let absolutePath = appBundlePath.hasPrefix("/")
? appBundlePath
: "\(FileManager.default.currentDirectoryPath)/\(appBundlePath)"
- try codesignClientAppBundle(at: absolutePath, withCodeSignIdentity: codeSignIdentity)
+
+ try codesignClientAppBundle(
+ at: absolutePath,
+ withCodeSignIdentity: codeSignIdentity,
+ usingEntitlements: entitlementsPath
+ )
}
}
diff -Nru nextcloud-desktop-3.16.4/admin/osx/mac-crafter/Sources/Utils/Codesign.swift nextcloud-desktop-3.16.6/admin/osx/mac-crafter/Sources/Utils/Codesign.swift
--- nextcloud-desktop-3.16.4/admin/osx/mac-crafter/Sources/Utils/Codesign.swift 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/admin/osx/mac-crafter/Sources/Utils/Codesign.swift 2025-06-18 22:57:35.000000000 +0200
@@ -55,9 +55,17 @@
func codesign(identity: String, path: String, options: String = defaultCodesignOptions) throws {
print("Code-signing \(path)...")
let command = "codesign -s \"\(identity)\" \(options) \"\(path)\""
- guard shell(command) == 0 else {
- throw CodeSigningError.failedToCodeSign("Failed to code-sign \(path).")
+ for _ in 1...5 {
+ guard shell(command) == 0 else {
+ print("Code-signing failed, retrying ...")
+ continue
+ }
+
+ // code signing was successful
+ return
}
+
+ throw CodeSigningError.failedToCodeSign("Failed to code-sign \(path).")
}
func recursivelyCodesign(
@@ -99,7 +107,9 @@
}
func codesignClientAppBundle(
- at clientAppDir: String, withCodeSignIdentity codeSignIdentity: String
+ at clientAppDir: String,
+ withCodeSignIdentity codeSignIdentity: String,
+ usingEntitlements entitlementsPath: String? = nil
) throws {
print("Code-signing Nextcloud Desktop Client libraries, frameworks and plugins...")
@@ -189,5 +199,13 @@
let mainExecutableName = String(appName.dropLast(".app".count))
let mainExecutablePath = "\(binariesDir)/\(mainExecutableName)"
try recursivelyCodesign(path: binariesDir, identity: codeSignIdentity, skip: [mainExecutablePath])
- try codesign(identity: codeSignIdentity, path: mainExecutablePath)
+
+ var mainExecutableCodesignOptions = defaultCodesignOptions
+ if let entitlementsPath {
+ mainExecutableCodesignOptions =
+ "--timestamp --force --verbose=4 --options runtime --entitlements \"\(entitlementsPath)\""
+ }
+ try codesign(
+ identity: codeSignIdentity, path: mainExecutablePath, options: mainExecutableCodesignOptions
+ )
}
diff -Nru nextcloud-desktop-3.16.4/admin/osx/macosx.entitlements.cmake nextcloud-desktop-3.16.6/admin/osx/macosx.entitlements.cmake
--- nextcloud-desktop-3.16.4/admin/osx/macosx.entitlements.cmake 1970-01-01 01:00:00.000000000 +0100
+++ nextcloud-desktop-3.16.6/admin/osx/macosx.entitlements.cmake 2025-06-18 22:57:35.000000000 +0200
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>com.apple.security.application-groups</key>
+ <array>
+ <string>@SOCKETAPI_TEAM_IDENTIFIER_PREFIX@@APPLICATION_REV_DOMAIN@</string>
+ </array>
+</dict>
+</plist>
diff -Nru nextcloud-desktop-3.16.4/admin/win/msi/Nextcloud.wxs nextcloud-desktop-3.16.6/admin/win/msi/Nextcloud.wxs
--- nextcloud-desktop-3.16.4/admin/win/msi/Nextcloud.wxs 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/admin/win/msi/Nextcloud.wxs 2025-06-18 22:57:35.000000000 +0200
@@ -44,8 +44,10 @@
https://www.firegiant.com/wix/tutorial/upgrades-and-modularization/replacing-ourselves/
https://www.joyofsetup.com/2010/01/16/major-upgrades-now-easier-than-ever/
-->
- <MajorUpgrade Schedule="afterInstallInitialize" AllowDowngrades="yes" />
- <Property Id="REINSTALLMODE" Value="amus" />
+ <MajorUpgrade Schedule="afterInstallExecute" AllowDowngrades="yes" />
+ <Property Id="REINSTALLMODE" Value="dmus" />
+ <Property Id="MSIRMSHUTDOWN" Value="1" />
+ <Property Id="REBOOT" Value="ReallySuppress" />
<Media Id="1" Cabinet="$(var.AppShortName).cab" EmbedCab="yes" />
@@ -88,9 +90,6 @@
<!-- Uninstall: Cleanup the Registry -->
<Custom Action="RegistryCleanupCustomAction" After="RemoveFiles">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
-
- <!-- Schedule Reboot for the Shell Extensions (in silent installation mode only, or if SCHEDULE_REBOOT argument is set-->
- <ScheduleReboot After="InstallFinalize">(SCHEDULE_REBOOT=1) OR NOT (UILevel=2)</ScheduleReboot>
</InstallExecuteSequence>
<!-- "Add or Remove" Programs Entries -->
diff -Nru nextcloud-desktop-3.16.4/debian/changelog nextcloud-desktop-3.16.6/debian/changelog
--- nextcloud-desktop-3.16.4/debian/changelog 2025-05-03 23:57:43.000000000 +0200
+++ nextcloud-desktop-3.16.6/debian/changelog 2025-07-27 14:55:49.000000000 +0200
@@ -1,3 +1,24 @@
+nextcloud-desktop (3.16.6-3) unstable; urgency=medium
+
+ * Release to unstable (#1091614 is fixed).
+
+ -- Sandro Knau? <hefee at debian.org> Sun, 27 Jul 2025 14:55:49 +0200
+
+nextcloud-desktop (3.16.6-2) experimental; urgency=medium
+
+ * Fix again "nextcloud enters busy loop when using a share on NTFS."
+ (Closes: 1091614)
+
+ -- Sandro Knau? <hefee at debian.org> Sun, 27 Jul 2025 12:54:15 +0200
+
+nextcloud-desktop (3.16.6-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Update patch hunks.
+ * Remove patch for #1091614, it seems fixed on upstream.
+
+ -- Sandro Knau? <hefee at debian.org> Mon, 21 Jul 2025 20:21:07 +0200
+
nextcloud-desktop (3.16.4-1) unstable; urgency=medium
* New upstream release.
diff -Nru nextcloud-desktop-3.16.4/debian/patches/0003-Use-release-version-for-Debian.patch nextcloud-desktop-3.16.6/debian/patches/0003-Use-release-version-for-Debian.patch
--- nextcloud-desktop-3.16.4/debian/patches/0003-Use-release-version-for-Debian.patch 2025-05-03 23:57:43.000000000 +0200
+++ nextcloud-desktop-3.16.6/debian/patches/0003-Use-release-version-for-Debian.patch 2025-07-27 14:55:49.000000000 +0200
@@ -8,10 +8,10 @@
1 file changed, 5 insertions(+)
diff --git a/VERSION.cmake b/VERSION.cmake
-index 3fe5f77..1600bcd 100644
+index 8e9ac37..acfa1c7 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
-@@ -64,3 +64,8 @@ endif()
+@@ -66,3 +66,8 @@ endif()
# ------------------------------------
# Not used anymore. For brander, please maintain craftmaster.ini
set(QT_MAJOR_VERSION 6)
diff -Nru nextcloud-desktop-3.16.4/debian/patches/0004-Don-t-use-GuiPrivate.patch nextcloud-desktop-3.16.6/debian/patches/0004-Don-t-use-GuiPrivate.patch
--- nextcloud-desktop-3.16.4/debian/patches/0004-Don-t-use-GuiPrivate.patch 2025-05-03 23:57:43.000000000 +0200
+++ nextcloud-desktop-3.16.6/debian/patches/0004-Don-t-use-GuiPrivate.patch 2025-07-27 14:55:49.000000000 +0200
@@ -10,7 +10,7 @@
1 file changed, 5 deletions(-)
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index 2bfa004..d3fb5aa 100644
+index a58117f..21be04c 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -3,10 +3,6 @@ find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS Widgets Svg Qml Quick Qui
@@ -24,7 +24,7 @@
if(CMAKE_BUILD_TYPE MATCHES Debug)
add_definitions(-DQT_QML_DEBUG)
endif()
-@@ -556,7 +552,6 @@ target_link_libraries(nextcloudCore
+@@ -560,7 +556,6 @@ target_link_libraries(nextcloudCore
PUBLIC
Nextcloud::sync
Qt::Widgets
diff -Nru nextcloud-desktop-3.16.4/debian/patches/0004-GIT_SHA1-points-to-the-sha1-of-upstream.patch nextcloud-desktop-3.16.6/debian/patches/0004-GIT_SHA1-points-to-the-sha1-of-upstream.patch
--- nextcloud-desktop-3.16.4/debian/patches/0004-GIT_SHA1-points-to-the-sha1-of-upstream.patch 2025-05-03 23:57:43.000000000 +0200
+++ nextcloud-desktop-3.16.6/debian/patches/0004-GIT_SHA1-points-to-the-sha1-of-upstream.patch 2025-07-27 14:55:49.000000000 +0200
@@ -10,7 +10,7 @@
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b7448b..ee4a394 100644
+index 140ffa8..8cf4499 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,9 +112,8 @@ include(GNUInstallDirs)
diff -Nru nextcloud-desktop-3.16.4/debian/patches/0006-Revert-better-logs-and-factor-common-code-in-folder-.patch nextcloud-desktop-3.16.6/debian/patches/0006-Revert-better-logs-and-factor-common-code-in-folder-.patch
--- nextcloud-desktop-3.16.4/debian/patches/0006-Revert-better-logs-and-factor-common-code-in-folder-.patch 2025-05-03 23:57:43.000000000 +0200
+++ nextcloud-desktop-3.16.6/debian/patches/0006-Revert-better-logs-and-factor-common-code-in-folder-.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-From: =?utf-8?q?Sandro_Knau=C3=9F?= <hefee at debian.org>
-Date: Sun, 5 Jan 2025 20:33:16 +0100
-Subject: Revert "better logs and factor common code in folder permissions
- handling"
-
-This reverts commit 1417e8cb60e84762f94345b21d587fb54bc90b51.
----
- src/libsync/owncloudpropagator.cpp | 19 ++++++++-----------
- 1 file changed, 8 insertions(+), 11 deletions(-)
-
-diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
-index e239f05..04e556f 100644
---- a/src/libsync/owncloudpropagator.cpp
-+++ b/src/libsync/owncloudpropagator.cpp
-@@ -1497,18 +1497,15 @@ void PropagateDirectory::slotSubJobsFinished(SyncFileItem::Status status)
- }
- } else {
- try {
-- const auto permissionsChangeHelper = [] (const auto fileName)
-- {
-- qCDebug(lcDirectory) << fileName << "permissions changed: old permissions" << static_cast<int>(std::filesystem::status(fileName.toStdWString()).permissions());
-- FileSystem::setFolderPermissions(fileName, FileSystem::FolderPermissions::ReadWrite);
-- qCDebug(lcDirectory) << fileName << "applied new permissions" << static_cast<int>(std::filesystem::status(fileName.toStdWString()).permissions());
-- };
--
-- if (const auto fileName = propagator()->fullLocalPath(_item->_file); FileSystem::fileExists(fileName)) {
-- permissionsChangeHelper(fileName);
-+ if (FileSystem::fileExists(propagator()->fullLocalPath(_item->_file))) {
-+ qCDebug(lcDirectory) << propagator()->fullLocalPath(_item->_file) << "old permissions" << static_cast<int>(std::filesystem::status(propagator()->fullLocalPath(_item->_file).toStdWString()).permissions());
-+ FileSystem::setFolderPermissions(propagator()->fullLocalPath(_item->_file), FileSystem::FolderPermissions::ReadWrite);
-+ qCDebug(lcDirectory) << propagator()->fullLocalPath(_item->_file) << "new permissions" << static_cast<int>(std::filesystem::status(propagator()->fullLocalPath(_item->_file).toStdWString()).permissions());
- }
-- if (const auto fileName = propagator()->fullLocalPath(_item->_renameTarget); !_item->_renameTarget.isEmpty() && FileSystem::fileExists(fileName)) {
-- permissionsChangeHelper(fileName);
-+ if (!_item->_renameTarget.isEmpty() && FileSystem::fileExists(propagator()->fullLocalPath(_item->_renameTarget))) {
-+ qCDebug(lcDirectory) << "old permissions" << static_cast<int>(std::filesystem::status(propagator()->fullLocalPath(_item->_renameTarget).toStdWString()).permissions());
-+ FileSystem::setFolderPermissions(propagator()->fullLocalPath(_item->_renameTarget), FileSystem::FolderPermissions::ReadWrite);
-+ qCDebug(lcDirectory) << "new permissions" << static_cast<int>(std::filesystem::status(propagator()->fullLocalPath(_item->_renameTarget).toStdWString()).permissions());
- }
- }
- catch (const std::filesystem::filesystem_error &e)
diff -Nru nextcloud-desktop-3.16.4/debian/patches/0006-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch nextcloud-desktop-3.16.6/debian/patches/0006-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch
--- nextcloud-desktop-3.16.4/debian/patches/0006-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch 1970-01-01 01:00:00.000000000 +0100
+++ nextcloud-desktop-3.16.6/debian/patches/0006-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch 2025-07-27 14:55:49.000000000 +0200
@@ -0,0 +1,169 @@
+From: =?utf-8?q?Sandro_Knau=C3=9F?= <hefee at debian.org>
+Date: Sun, 27 Jul 2025 12:24:51 +0200
+Subject: Revert "ensure no any user writable permissions in Nextcloud sync
+ folder"
+
+This reverts commit 5b2af166d3d9c8537c565922750392d4a3f6610e.
+
+Updated to apply and match for 3.16.6.
+
+Origin: backport
+Bug-Debian: https://bugs.debian.org/1091614
+Bug: https://github.com/nextcloud/desktop/issues/7613
+Forwarded: not-needed
+Last-Update: 2025-07-25
+---
+ src/csync/csync.h | 2 --
+ src/csync/vio/csync_vio_local_unix.cpp | 1 -
+ src/libsync/discovery.cpp | 11 -----------
+ src/libsync/discoveryphase.cpp | 1 -
+ src/libsync/discoveryphase.h | 1 -
+ src/libsync/owncloudpropagator.cpp | 7 +++++++
+ src/libsync/syncengine.cpp | 4 ----
+ src/libsync/syncfileitem.h | 2 --
+ 8 files changed, 7 insertions(+), 22 deletions(-)
+
+diff --git a/src/csync/csync.h b/src/csync/csync.h
+index 8329020..ff1ec56 100644
+--- a/src/csync/csync.h
++++ b/src/csync/csync.h
+@@ -218,7 +218,6 @@ struct OCSYNC_EXPORT csync_file_stat_s {
+ bool is_hidden BITFIELD(1); // Not saved in the DB, only used during discovery for local files.
+ bool isE2eEncrypted BITFIELD(1);
+ bool is_metadata_missing BITFIELD(1); // Indicates the file has missing metadata, f.ex. the file is not a placeholder in case of vfs.
+- bool isPermissionsInvalid BITFIELD(1);
+
+ QByteArray path;
+ QByteArray rename_path;
+@@ -246,7 +245,6 @@ struct OCSYNC_EXPORT csync_file_stat_s {
+ , is_hidden(false)
+ , isE2eEncrypted(false)
+ , is_metadata_missing(false)
+- , isPermissionsInvalid(false)
+ { }
+ };
+
+diff --git a/src/csync/vio/csync_vio_local_unix.cpp b/src/csync/vio/csync_vio_local_unix.cpp
+index 8f319a3..55cd0f0 100644
+--- a/src/csync/vio/csync_vio_local_unix.cpp
++++ b/src/csync/vio/csync_vio_local_unix.cpp
+@@ -169,7 +169,6 @@ static int _csync_vio_local_stat_mb(const mbchar_t *wuri, csync_file_stat_t *buf
+ buf->inode = sb.st_ino;
+ buf->modtime = sb.st_mtime;
+ buf->size = sb.st_size;
+- buf->isPermissionsInvalid = (sb.st_mode & S_IWOTH) == S_IWOTH;
+
+ return 0;
+ }
+diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
+index 5d2ab48..840b433 100644
+--- a/src/libsync/discovery.cpp
++++ b/src/libsync/discovery.cpp
+@@ -1127,10 +1127,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
+ if (_queryLocal != NormalQuery && _queryServer != NormalQuery)
+ recurse = false;
+
+- if (localEntry.isPermissionsInvalid) {
+- recurse = true;
+- }
+-
+ if ((item->_direction == SyncFileItem::Down || item->_instruction == CSYNC_INSTRUCTION_CONFLICT || item->_instruction == CSYNC_INSTRUCTION_NEW || item->_instruction == CSYNC_INSTRUCTION_SYNC) &&
+ item->_direction != SyncFileItem::Up &&
+ (item->_modtime <= 0 || item->_modtime >= 0xFFFFFFFF)) {
+@@ -1159,13 +1155,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
+ }
+ }
+
+- if (localEntry.isPermissionsInvalid && item->_instruction == CSyncEnums::CSYNC_INSTRUCTION_NONE) {
+- item->_instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
+- item->_direction = SyncFileItem::Down;
+- }
+-
+- item->isPermissionsInvalid = localEntry.isPermissionsInvalid;
+-
+ auto recurseQueryLocal = _queryLocal == ParentNotChanged ? ParentNotChanged : localEntry.isDirectory || item->_instruction == CSYNC_INSTRUCTION_RENAME ? NormalQuery : ParentDontExist;
+ processFileFinalize(item, path, recurse, recurseQueryLocal, recurseQueryServer);
+ };
+diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp
+index 7edd684..f881a21 100644
+--- a/src/libsync/discoveryphase.cpp
++++ b/src/libsync/discoveryphase.cpp
+@@ -370,7 +370,6 @@ void DiscoverySingleLocalDirectoryJob::run() {
+ i.isSymLink = dirent->type == ItemTypeSoftLink;
+ i.isVirtualFile = dirent->type == ItemTypeVirtualFile || dirent->type == ItemTypeVirtualFileDownload;
+ i.isMetadataMissing = dirent->is_metadata_missing;
+- i.isPermissionsInvalid = dirent->isPermissionsInvalid;
+ i.type = dirent->type;
+ results.push_back(i);
+ }
+diff --git a/src/libsync/discoveryphase.h b/src/libsync/discoveryphase.h
+index 0c9edce..913f37f 100644
+--- a/src/libsync/discoveryphase.h
++++ b/src/libsync/discoveryphase.h
+@@ -107,7 +107,6 @@ struct LocalInfo
+ bool isVirtualFile = false;
+ bool isSymLink = false;
+ bool isMetadataMissing = false;
+- bool isPermissionsInvalid = false;
+ [[nodiscard]] bool isValid() const { return !name.isNull(); }
+ };
+
+diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
+index fba85c5..10eedaf 100644
+--- a/src/libsync/owncloudpropagator.cpp
++++ b/src/libsync/owncloudpropagator.cpp
+@@ -1472,12 +1472,18 @@ void PropagateDirectory::slotSubJobsFinished(SyncFileItem::Status status)
+ try {
+ if (const auto fileName = propagator()->fullLocalPath(_item->_file); FileSystem::fileExists(fileName)) {
+ FileSystem::setFolderPermissions(fileName, FileSystem::FolderPermissions::ReadOnly);
++ qCDebug(lcDirectory) << fileName << "permissions changed: old permissions" << static_cast<int>(std::filesystem::status(fileName.toStdWString()).permissions());
++ std::filesystem::permissions(fileName.toStdWString(), std::filesystem::perms::owner_write | std::filesystem::perms::group_write | std::filesystem::perms::others_write, std::filesystem::perm_options::remove);
+ Q_EMIT propagator()->touchedFile(fileName);
++ qCDebug(lcDirectory) << fileName << "applied new permissions" << static_cast<int>(std::filesystem::status(fileName.toStdWString()).permissions());
+ }
+ if (!_item->_renameTarget.isEmpty() && FileSystem::fileExists(propagator()->fullLocalPath(_item->_renameTarget))) {
+ const auto fileName = propagator()->fullLocalPath(_item->_renameTarget);
+ FileSystem::setFolderPermissions(fileName, FileSystem::FolderPermissions::ReadOnly);
++ qCDebug(lcDirectory) << fileName << "permissions changed: old permissions" << static_cast<int>(std::filesystem::status(fileName.toStdWString()).permissions());
++ std::filesystem::permissions(fileName.toStdWString(), std::filesystem::perms::owner_write | std::filesystem::perms::group_write | std::filesystem::perms::others_write, std::filesystem::perm_options::remove);
+ Q_EMIT propagator()->touchedFile(fileName);
++ qCDebug(lcDirectory) << fileName << "applied new permissions" << static_cast<int>(std::filesystem::status(fileName.toStdWString()).permissions());
+ }
+ }
+ catch (const std::filesystem::filesystem_error &e)
+@@ -1504,6 +1510,7 @@ void PropagateDirectory::slotSubJobsFinished(SyncFileItem::Status status)
+ {
+ qCDebug(lcDirectory) << fileName << "permissions changed: old permissions" << static_cast<int>(std::filesystem::status(fileName.toStdWString()).permissions());
+ FileSystem::setFolderPermissions(fileName, FileSystem::FolderPermissions::ReadWrite);
++ std::filesystem::permissions(fileName.toStdWString(), std::filesystem::perms::owner_write, std::filesystem::perm_options::add);
+ Q_EMIT propagator()->touchedFile(fileName);
+ qCDebug(lcDirectory) << fileName << "applied new permissions" << static_cast<int>(std::filesystem::status(fileName.toStdWString()).permissions());
+ };
+diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
+index e24ce8a..8237905 100644
+--- a/src/libsync/syncengine.cpp
++++ b/src/libsync/syncengine.cpp
+@@ -362,10 +362,6 @@ void OCC::SyncEngine::slotItemDiscovered(const OCC::SyncFileItemPtr &item)
+ const bool isReadOnly = !item->_remotePerm.isNull() && !item->_remotePerm.hasPermission(RemotePermissions::CanWrite);
+ modificationHappened = FileSystem::setFileReadOnlyWeak(filePath, isReadOnly);
+ }
+- if (item->isPermissionsInvalid) {
+- const auto isReadOnly = !item->_remotePerm.isNull() && !item->_remotePerm.hasPermission(RemotePermissions::CanWrite);
+- FileSystem::setFileReadOnly(filePath, isReadOnly);
+- }
+
+ modificationHappened |= item->_size != prev._fileSize;
+
+diff --git a/src/libsync/syncfileitem.h b/src/libsync/syncfileitem.h
+index 154d13a..041e48d 100644
+--- a/src/libsync/syncfileitem.h
++++ b/src/libsync/syncfileitem.h
+@@ -344,8 +344,6 @@ public:
+ bool _isLivePhoto = false;
+ QString _livePhotoFile;
+
+- bool isPermissionsInvalid = false;
+-
+ QString _discoveryResult;
+
+ /// if true, requests the file to be permanently deleted instead of moved to the trashbin
diff -Nru nextcloud-desktop-3.16.4/debian/patches/0007-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch nextcloud-desktop-3.16.6/debian/patches/0007-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch
--- nextcloud-desktop-3.16.4/debian/patches/0007-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch 2025-05-03 23:57:43.000000000 +0200
+++ nextcloud-desktop-3.16.6/debian/patches/0007-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,182 +0,0 @@
-From: =?utf-8?q?Sandro_Knau=C3=9F?= <hefee at debian.org>
-Date: Sun, 5 Jan 2025 23:17:28 +0100
-Subject: Revert "ensure no any user writable permissions in Nextcloud sync
- folder"
-
-This reverts commit 5b2af166d3d9c8537c565922750392d4a3f6610e.
----
- src/csync/csync.h | 2 --
- src/csync/vio/csync_vio_local_unix.cpp | 2 --
- src/libsync/discovery.cpp | 11 -----------
- src/libsync/discoveryphase.cpp | 1 -
- src/libsync/discoveryphase.h | 1 -
- src/libsync/filesystem.cpp | 1 -
- src/libsync/owncloudpropagator.cpp | 14 +++++++++++---
- src/libsync/syncengine.cpp | 4 ----
- src/libsync/syncfileitem.h | 2 --
- 9 files changed, 11 insertions(+), 27 deletions(-)
-
-diff --git a/src/csync/csync.h b/src/csync/csync.h
-index 8329020..ff1ec56 100644
---- a/src/csync/csync.h
-+++ b/src/csync/csync.h
-@@ -218,7 +218,6 @@ struct OCSYNC_EXPORT csync_file_stat_s {
- bool is_hidden BITFIELD(1); // Not saved in the DB, only used during discovery for local files.
- bool isE2eEncrypted BITFIELD(1);
- bool is_metadata_missing BITFIELD(1); // Indicates the file has missing metadata, f.ex. the file is not a placeholder in case of vfs.
-- bool isPermissionsInvalid BITFIELD(1);
-
- QByteArray path;
- QByteArray rename_path;
-@@ -246,7 +245,6 @@ struct OCSYNC_EXPORT csync_file_stat_s {
- , is_hidden(false)
- , isE2eEncrypted(false)
- , is_metadata_missing(false)
-- , isPermissionsInvalid(false)
- { }
- };
-
-diff --git a/src/csync/vio/csync_vio_local_unix.cpp b/src/csync/vio/csync_vio_local_unix.cpp
-index 8f319a3..b68eb31 100644
---- a/src/csync/vio/csync_vio_local_unix.cpp
-+++ b/src/csync/vio/csync_vio_local_unix.cpp
-@@ -169,7 +169,5 @@ static int _csync_vio_local_stat_mb(const mbchar_t *wuri, csync_file_stat_t *buf
- buf->inode = sb.st_ino;
- buf->modtime = sb.st_mtime;
- buf->size = sb.st_size;
-- buf->isPermissionsInvalid = (sb.st_mode & S_IWOTH) == S_IWOTH;
--
- return 0;
- }
-diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
-index a97585a..769a559 100644
---- a/src/libsync/discovery.cpp
-+++ b/src/libsync/discovery.cpp
-@@ -1117,10 +1117,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
- if (_queryLocal != NormalQuery && _queryServer != NormalQuery)
- recurse = false;
-
-- if (localEntry.isPermissionsInvalid) {
-- recurse = true;
-- }
--
- if ((item->_direction == SyncFileItem::Down || item->_instruction == CSYNC_INSTRUCTION_CONFLICT || item->_instruction == CSYNC_INSTRUCTION_NEW || item->_instruction == CSYNC_INSTRUCTION_SYNC) &&
- item->_direction != SyncFileItem::Up &&
- (item->_modtime <= 0 || item->_modtime >= 0xFFFFFFFF)) {
-@@ -1149,13 +1145,6 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
- }
- }
-
-- if (localEntry.isPermissionsInvalid && item->_instruction == CSyncEnums::CSYNC_INSTRUCTION_NONE) {
-- item->_instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
-- item->_direction = SyncFileItem::Down;
-- }
--
-- item->isPermissionsInvalid = localEntry.isPermissionsInvalid;
--
- auto recurseQueryLocal = _queryLocal == ParentNotChanged ? ParentNotChanged : localEntry.isDirectory || item->_instruction == CSYNC_INSTRUCTION_RENAME ? NormalQuery : ParentDontExist;
- processFileFinalize(item, path, recurse, recurseQueryLocal, recurseQueryServer);
- };
-diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp
-index 9b72732..51813ae 100644
---- a/src/libsync/discoveryphase.cpp
-+++ b/src/libsync/discoveryphase.cpp
-@@ -371,7 +371,6 @@ void DiscoverySingleLocalDirectoryJob::run() {
- i.isSymLink = dirent->type == ItemTypeSoftLink;
- i.isVirtualFile = dirent->type == ItemTypeVirtualFile || dirent->type == ItemTypeVirtualFileDownload;
- i.isMetadataMissing = dirent->is_metadata_missing;
-- i.isPermissionsInvalid = dirent->isPermissionsInvalid;
- i.type = dirent->type;
- results.push_back(i);
- }
-diff --git a/src/libsync/discoveryphase.h b/src/libsync/discoveryphase.h
-index 0c9edce..913f37f 100644
---- a/src/libsync/discoveryphase.h
-+++ b/src/libsync/discoveryphase.h
-@@ -107,7 +107,6 @@ struct LocalInfo
- bool isVirtualFile = false;
- bool isSymLink = false;
- bool isMetadataMissing = false;
-- bool isPermissionsInvalid = false;
- [[nodiscard]] bool isValid() const { return !name.isNull(); }
- };
-
-diff --git a/src/libsync/filesystem.cpp b/src/libsync/filesystem.cpp
-index 3150819..28c3533 100644
---- a/src/libsync/filesystem.cpp
-+++ b/src/libsync/filesystem.cpp
-@@ -507,7 +507,6 @@ bool FileSystem::setFolderPermissions(const QString &path,
- case OCC::FileSystem::FolderPermissions::ReadOnly:
- break;
- case OCC::FileSystem::FolderPermissions::ReadWrite:
-- std::filesystem::permissions(stdStrPath, std::filesystem::perms::others_write, std::filesystem::perm_options::remove);
- std::filesystem::permissions(stdStrPath, std::filesystem::perms::owner_write, std::filesystem::perm_options::add);
- break;
- }
-diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
-index 480baa8..220d7f7 100644
---- a/src/libsync/owncloudpropagator.cpp
-+++ b/src/libsync/owncloudpropagator.cpp
-@@ -1470,9 +1470,15 @@ void PropagateDirectory::slotSubJobsFinished(SyncFileItem::Status status)
- try {
- if (FileSystem::fileExists(propagator()->fullLocalPath(_item->_file))) {
- FileSystem::setFolderPermissions(propagator()->fullLocalPath(_item->_file), FileSystem::FolderPermissions::ReadOnly);
-+ qCDebug(lcDirectory) << "old permissions" << static_cast<int>(std::filesystem::status(propagator()->fullLocalPath(_item->_file).toStdWString()).permissions());
-+ std::filesystem::permissions(propagator()->fullLocalPath(_item->_file).toStdWString(), std::filesystem::perms::owner_write | std::filesystem::perms::group_write | std::filesystem::perms::others_write, std::filesystem::perm_options::remove);
-+ qCDebug(lcDirectory) << "new permissions" << static_cast<int>(std::filesystem::status(propagator()->fullLocalPath(_item->_file).toStdWString()).permissions());
- }
- if (!_item->_renameTarget.isEmpty() && FileSystem::fileExists(propagator()->fullLocalPath(_item->_renameTarget))) {
- FileSystem::setFolderPermissions(propagator()->fullLocalPath(_item->_renameTarget), FileSystem::FolderPermissions::ReadOnly);
-+ qCDebug(lcDirectory) << "old permissions" << static_cast<int>(std::filesystem::status(propagator()->fullLocalPath(_item->_renameTarget).toStdWString()).permissions());
-+ std::filesystem::permissions(propagator()->fullLocalPath(_item->_renameTarget).toStdWString(), std::filesystem::perms::owner_write | std::filesystem::perms::group_write | std::filesystem::perms::others_write, std::filesystem::perm_options::remove);
-+ qCDebug(lcDirectory) << "new permissions" << static_cast<int>(std::filesystem::status(propagator()->fullLocalPath(_item->_renameTarget).toStdWString()).permissions());
- }
- }
- catch (const std::filesystem::filesystem_error &e)
-@@ -1496,13 +1502,15 @@ void PropagateDirectory::slotSubJobsFinished(SyncFileItem::Status status)
- } else {
- try {
- if (FileSystem::fileExists(propagator()->fullLocalPath(_item->_file))) {
-- qCDebug(lcDirectory) << propagator()->fullLocalPath(_item->_file) << "old permissions" << static_cast<int>(std::filesystem::status(propagator()->fullLocalPath(_item->_file).toStdWString()).permissions());
- FileSystem::setFolderPermissions(propagator()->fullLocalPath(_item->_file), FileSystem::FolderPermissions::ReadWrite);
-- qCDebug(lcDirectory) << propagator()->fullLocalPath(_item->_file) << "new permissions" << static_cast<int>(std::filesystem::status(propagator()->fullLocalPath(_item->_file).toStdWString()).permissions());
-+ qCDebug(lcDirectory) << "old permissions" << static_cast<int>(std::filesystem::status(propagator()->fullLocalPath(_item->_file).toStdWString()).permissions());
-+ std::filesystem::permissions(propagator()->fullLocalPath(_item->_file).toStdWString(), std::filesystem::perms::owner_write, std::filesystem::perm_options::add);
-+ qCDebug(lcDirectory) << "new permissions" << static_cast<int>(std::filesystem::status(propagator()->fullLocalPath(_item->_file).toStdWString()).permissions());
- }
- if (!_item->_renameTarget.isEmpty() && FileSystem::fileExists(propagator()->fullLocalPath(_item->_renameTarget))) {
-- qCDebug(lcDirectory) << "old permissions" << static_cast<int>(std::filesystem::status(propagator()->fullLocalPath(_item->_renameTarget).toStdWString()).permissions());
- FileSystem::setFolderPermissions(propagator()->fullLocalPath(_item->_renameTarget), FileSystem::FolderPermissions::ReadWrite);
-+ qCDebug(lcDirectory) << "old permissions" << static_cast<int>(std::filesystem::status(propagator()->fullLocalPath(_item->_renameTarget).toStdWString()).permissions());
-+ std::filesystem::permissions(propagator()->fullLocalPath(_item->_renameTarget).toStdWString(), std::filesystem::perms::owner_write, std::filesystem::perm_options::add);
- qCDebug(lcDirectory) << "new permissions" << static_cast<int>(std::filesystem::status(propagator()->fullLocalPath(_item->_renameTarget).toStdWString()).permissions());
- }
- }
-diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
-index e24ce8a..8237905 100644
---- a/src/libsync/syncengine.cpp
-+++ b/src/libsync/syncengine.cpp
-@@ -362,10 +362,6 @@ void OCC::SyncEngine::slotItemDiscovered(const OCC::SyncFileItemPtr &item)
- const bool isReadOnly = !item->_remotePerm.isNull() && !item->_remotePerm.hasPermission(RemotePermissions::CanWrite);
- modificationHappened = FileSystem::setFileReadOnlyWeak(filePath, isReadOnly);
- }
-- if (item->isPermissionsInvalid) {
-- const auto isReadOnly = !item->_remotePerm.isNull() && !item->_remotePerm.hasPermission(RemotePermissions::CanWrite);
-- FileSystem::setFileReadOnly(filePath, isReadOnly);
-- }
-
- modificationHappened |= item->_size != prev._fileSize;
-
-diff --git a/src/libsync/syncfileitem.h b/src/libsync/syncfileitem.h
-index 154d13a..041e48d 100644
---- a/src/libsync/syncfileitem.h
-+++ b/src/libsync/syncfileitem.h
-@@ -344,8 +344,6 @@ public:
- bool _isLivePhoto = false;
- QString _livePhotoFile;
-
-- bool isPermissionsInvalid = false;
--
- QString _discoveryResult;
-
- /// if true, requests the file to be permanently deleted instead of moved to the trashbin
diff -Nru nextcloud-desktop-3.16.4/debian/patches/series nextcloud-desktop-3.16.6/debian/patches/series
--- nextcloud-desktop-3.16.4/debian/patches/series 2025-05-03 23:57:43.000000000 +0200
+++ nextcloud-desktop-3.16.6/debian/patches/series 2025-07-27 14:55:49.000000000 +0200
@@ -3,5 +3,4 @@
0003-Use-release-version-for-Debian.patch
0004-GIT_SHA1-points-to-the-sha1-of-upstream.patch
0004-Don-t-use-GuiPrivate.patch
-0006-Revert-better-logs-and-factor-common-code-in-folder-.patch
-0007-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch
+0006-Revert-ensure-no-any-user-writable-permissions-in-Ne.patch
diff -Nru nextcloud-desktop-3.16.4/nextcloud.client-desktop/lv_translation.desktop nextcloud-desktop-3.16.6/nextcloud.client-desktop/lv_translation.desktop
--- nextcloud-desktop-3.16.4/nextcloud.client-desktop/lv_translation.desktop 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/nextcloud.client-desktop/lv_translation.desktop 2025-06-18 22:57:35.000000000 +0200
@@ -23,5 +23,5 @@
# Translations
Comment[lv]=@APPLICATION_NAME@ darbavirsmas sinhronize?anas klients
-GenericName[lv]=Mapju Sinhroniz??ana
+GenericName[lv]=Mapju sinhroniz??ana
Icon[lv]=@APPLICATION_ICON_NAME@
diff -Nru nextcloud-desktop-3.16.4/nextcloud.client-desktop/sw_translation.desktop nextcloud-desktop-3.16.6/nextcloud.client-desktop/sw_translation.desktop
--- nextcloud-desktop-3.16.4/nextcloud.client-desktop/sw_translation.desktop 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/nextcloud.client-desktop/sw_translation.desktop 2025-06-18 22:57:35.000000000 +0200
@@ -22,6 +22,7 @@
# Translations
+Name[sw]=@JINA LA APPLICATION at Desktop
Comment[sw]=Teja ya @APPLICATION_NAME@ ya kufanana faili kwa seva na faili ziko hapa
GenericName[sw]=Fanana Kabrasha
Icon[sw]=@APPLICATION_ICON_NAME@
diff -Nru nextcloud-desktop-3.16.4/nextcloud.client-desktop/uz_translation.desktop nextcloud-desktop-3.16.6/nextcloud.client-desktop/uz_translation.desktop
--- nextcloud-desktop-3.16.4/nextcloud.client-desktop/uz_translation.desktop 1970-01-01 01:00:00.000000000 +0100
+++ nextcloud-desktop-3.16.6/nextcloud.client-desktop/uz_translation.desktop 2025-06-18 22:57:35.000000000 +0200
@@ -0,0 +1,28 @@
+[Desktop Entry]
+Categories=Utility;X-SuSE-SyncUtility;
+Type=Application
+Exec=@APPLICATION_EXECUTABLE@ %u
+Name=@APPLICATION_NAME@ Desktop
+Comment=@APPLICATION_NAME@ desktop synchronization client
+GenericName=Folder Sync
+Icon=@APPLICATION_ICON_NAME@
+Keywords=@APPLICATION_NAME@;syncing;file;sharing;
+X-GNOME-Autostart-Delay=3
+MimeType=application/vnd. at APPLICATION_EXECUTABLE@;x-scheme-handler/@APPLICATION_URI_HANDLER_SCHEME@;
+SingleMainWindow=true
+Actions=Quit;
+
+# Translations
+ at LIBCLOUDPROVIDERS_DESKTOP_IMPLEMENTS@
+
+[Desktop Action Quit]
+Exec=@APPLICATION_EXECUTABLE@ --quit
+Name=Quit @APPLICATION_NAME@
+Icon=@APPLICATION_EXECUTABLE@
+
+
+# Translations
+Name[uz]=@APPLICATION_NAME@ Ish stoli
+Comment[uz]=@APPLICATION_NAME@ ish stoli sinxronizatsiya mijozi
+GenericName[uz]=Papkalarni sinxronlash
+Icon[uz]=@APPLICATION_ICON_NAME@
diff -Nru nextcloud-desktop-3.16.4/shell_integration/windows/NCUtil/CMakeLists.txt nextcloud-desktop-3.16.6/shell_integration/windows/NCUtil/CMakeLists.txt
--- nextcloud-desktop-3.16.4/shell_integration/windows/NCUtil/CMakeLists.txt 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/shell_integration/windows/NCUtil/CMakeLists.txt 2025-06-18 22:57:35.000000000 +0200
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2018 ownCloud GmbH
+# SPDX-License-Identifier: LGPL-2.1-or-later
+configure_file(Version.h.in ${CMAKE_CURRENT_BINARY_DIR}/Version.h)
+
add_library(NCUtil STATIC
CommunicationSocket.cpp
RemotePathChecker.cpp
@@ -7,5 +11,6 @@
target_include_directories(NCUtil
PUBLIC
- "${CMAKE_CURRENT_SOURCE_DIR}"
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
)
diff -Nru nextcloud-desktop-3.16.4/shell_integration/windows/NCUtil/Version.h nextcloud-desktop-3.16.6/shell_integration/windows/NCUtil/Version.h
--- nextcloud-desktop-3.16.4/shell_integration/windows/NCUtil/Version.h 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/shell_integration/windows/NCUtil/Version.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-#pragma once
-
-// This is the number that will end up in the version window of the DLLs.
-// Increment this version before committing a new build if you are today's shell_integration build master.
-#define NCEXT_BUILD_NUM 47
-
-#define STRINGIZE2(s) #s
-#define STRINGIZE(s) STRINGIZE2(s)
-
-#define NCEXT_VERSION 3,0,0,NCEXT_BUILD_NUM
-#define NCEXT_VERSION_STRING STRINGIZE(NCEXT_VERSION)
diff -Nru nextcloud-desktop-3.16.4/shell_integration/windows/NCUtil/Version.h.in nextcloud-desktop-3.16.6/shell_integration/windows/NCUtil/Version.h.in
--- nextcloud-desktop-3.16.4/shell_integration/windows/NCUtil/Version.h.in 1970-01-01 01:00:00.000000000 +0100
+++ nextcloud-desktop-3.16.6/shell_integration/windows/NCUtil/Version.h.in 2025-06-18 22:57:35.000000000 +0200
@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: 2016 ownCloud GmbH
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#pragma once
+
+// This is the number that will end up in the version window of the DLLs.
+// Increment this version before committing a new build if you are today's shell_integration build master.
+#cmakedefine NCEXT_BUILD_NUM @NCEXT_BUILD_NUM@
+
+#define STRINGIZE2(s) #s
+#define STRINGIZE(s) STRINGIZE2(s)
+
+#cmakedefine NCEXT_VERSION @NCEXT_VERSION@
+#define NCEXT_VERSION_STRING STRINGIZE(NCEXT_VERSION)
diff -Nru nextcloud-desktop-3.16.4/src/common/filesystembase.cpp nextcloud-desktop-3.16.6/src/common/filesystembase.cpp
--- nextcloud-desktop-3.16.4/src/common/filesystembase.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/common/filesystembase.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -35,6 +35,8 @@
#include <winbase.h>
#include <fcntl.h>
#include <io.h>
+#include <securitybaseapi.h>
+#include <sddl.h>
#endif
namespace OCC {
@@ -116,15 +118,16 @@
return;
}
- const auto fileAttributes = GetFileAttributesW(filename.toStdWString().c_str());
+ const auto windowsFilename = QDir::toNativeSeparators(filename);
+ const auto fileAttributes = GetFileAttributesW(windowsFilename.toStdWString().c_str());
if (fileAttributes == INVALID_FILE_ATTRIBUTES) {
const auto lastError = GetLastError();
auto errorMessage = static_cast<char*>(nullptr);
if (FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
nullptr, lastError, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), errorMessage, 0, nullptr) == 0) {
- qCWarning(lcFileSystem()) << "GetFileAttributesW" << filename << (readonly ? "readonly" : "read write") << errorMessage;
+ qCWarning(lcFileSystem()) << "GetFileAttributesW" << windowsFilename << (readonly ? "readonly" : "read write") << errorMessage;
} else {
- qCWarning(lcFileSystem()) << "GetFileAttributesW" << filename << (readonly ? "readonly" : "read write") << "unknown error" << lastError;
+ qCWarning(lcFileSystem()) << "GetFileAttributesW" << windowsFilename << (readonly ? "readonly" : "read write") << "unknown error" << lastError;
}
return;
}
@@ -136,17 +139,23 @@
newFileAttributes = newFileAttributes & (~FILE_ATTRIBUTE_READONLY);
}
- if (SetFileAttributesW(filename.toStdWString().c_str(), newFileAttributes) == 0) {
+ if (SetFileAttributesW(windowsFilename.toStdWString().c_str(), newFileAttributes) == 0) {
const auto lastError = GetLastError();
auto errorMessage = static_cast<char*>(nullptr);
if (FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
nullptr, lastError, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), errorMessage, 0, nullptr) == 0) {
- qCWarning(lcFileSystem()) << "SetFileAttributesW" << filename << (readonly ? "readonly" : "read write") << errorMessage;
+ qCWarning(lcFileSystem()) << "SetFileAttributesW" << windowsFilename << (readonly ? "readonly" : "read write") << errorMessage;
} else {
- qCWarning(lcFileSystem()) << "SetFileAttributesW" << filename << (readonly ? "readonly" : "read write") << "unknown error" << lastError;
+ qCWarning(lcFileSystem()) << "SetFileAttributesW" << windowsFilename << (readonly ? "readonly" : "read write") << "unknown error" << lastError;
}
}
+ if (!readonly) {
+ // current read-only folder ACL needs to be removed from files also when making a folder read-write
+ // we currently have a too limited set of authorization for files when applying the restrictive ACL for folders on the child files
+ setAclPermission(filename, FileSystem::FolderPermissions::ReadWrite, false);
+ }
+
return;
#endif
QFile file(filename);
@@ -392,8 +401,7 @@
// not valid. There needs to be one initialised here. Otherwise the incoming
// fileInfo is re-used.
if (fileInfo.filePath() != filename) {
- QFileInfo myFI(filename);
- re = myFI.exists();
+ re = QFileInfo::exists(filename);
}
return re;
}
@@ -547,22 +555,23 @@
bool FileSystem::remove(const QString &fileName, QString *errorString)
{
+ const auto &windowsSafeFileName = FileSystem::longWinPath(fileName);
#ifdef Q_OS_WIN
// You cannot delete a read-only file on windows, but we want to
// allow that.
- setFileReadOnly(fileName, false);
+ setFileReadOnly(windowsSafeFileName, false);
#endif
- const auto deletedFileInfo = QFileInfo{fileName};
+ const auto deletedFileInfo = QFileInfo{windowsSafeFileName};
if (!deletedFileInfo.exists()) {
- qCWarning(lcFileSystem()) << fileName << "has been already deleted";
+ qCWarning(lcFileSystem()) << windowsSafeFileName << "has been already deleted";
}
- QFile f(fileName);
+ QFile f(windowsSafeFileName);
if (!f.remove()) {
if (errorString) {
*errorString = f.errorString();
}
- qCWarning(lcFileSystem()) << f.errorString() << fileName;
+ qCWarning(lcFileSystem()) << f.errorString() << windowsSafeFileName;
#if defined Q_OS_WIN
const auto permissionsDisplayHelper = [] (std::filesystem::perms currentPermissions) {
@@ -581,10 +590,10 @@
<< unitaryHelper(std::filesystem::perms::others_exec, 'x');
};
- const auto unsafeFilePermissions = filePermissionsWin(fileName);
+ const auto unsafeFilePermissions = filePermissionsWin(windowsSafeFileName);
permissionsDisplayHelper(unsafeFilePermissions);
- const auto safeFilePermissions = filePermissionsWinSymlinkSafe(fileName);
+ const auto safeFilePermissions = filePermissionsWinSymlinkSafe(windowsSafeFileName);
permissionsDisplayHelper(safeFilePermissions);
#endif
@@ -688,6 +697,151 @@
}
return QStringLiteral(R"(\\?\)") + str;
}
+
+bool FileSystem::setAclPermission(const QString &unsafePath, FolderPermissions permissions, bool applyAlsoToFiles)
+{
+ SECURITY_INFORMATION info = DACL_SECURITY_INFORMATION;
+ std::unique_ptr<char[]> securityDescriptor;
+ auto neededLength = 0ul;
+
+ const auto path = longWinPath(unsafePath);
+
+ const auto safePathFileInfo = QFileInfo{path};
+
+ if (!GetFileSecurityW(path.toStdWString().c_str(), info, nullptr, 0, &neededLength)) {
+ const auto lastError = GetLastError();
+ if (lastError != ERROR_INSUFFICIENT_BUFFER) {
+ qCWarning(lcFileSystem) << "error when calling GetFileSecurityW" << path << lastError;
+ return false;
+ }
+
+ securityDescriptor.reset(new char[neededLength]);
+
+ if (!GetFileSecurityW(path.toStdWString().c_str(), info, securityDescriptor.get(), neededLength, &neededLength)) {
+ qCWarning(lcFileSystem) << "error when calling GetFileSecurityW" << path << GetLastError();
+ return false;
+ }
+ }
+
+ int daclPresent = false, daclDefault = false;
+ PACL resultDacl = nullptr;
+ if (!GetSecurityDescriptorDacl(securityDescriptor.get(), &daclPresent, &resultDacl, &daclDefault)) {
+ qCWarning(lcFileSystem) << "error when calling GetSecurityDescriptorDacl" << path << GetLastError();
+ return false;
+ }
+ if (!daclPresent || !resultDacl) {
+ qCWarning(lcFileSystem) << "error when calling DACL needed to set a folder read-only or read-write is missing" << path;
+ return false;
+ }
+
+ PSID sid = nullptr;
+ if (!ConvertStringSidToSidW(L"S-1-5-32-545", &sid))
+ {
+ qCWarning(lcFileSystem) << "error when calling ConvertStringSidToSidA" << path << GetLastError();
+ return false;
+ }
+
+ ACL_SIZE_INFORMATION aclSize;
+ if (!GetAclInformation(resultDacl, &aclSize, sizeof(aclSize), AclSizeInformation)) {
+ qCWarning(lcFileSystem) << "error when calling GetAclInformation" << path << GetLastError();
+ return false;
+ }
+
+ const auto newAclSize = aclSize.AclBytesInUse + sizeof(ACCESS_DENIED_ACE) + GetLengthSid(sid);
+ qCDebug(lcFileSystem) << "allocated a new DACL object of size" << newAclSize;
+
+ std::unique_ptr<ACL> newDacl{reinterpret_cast<PACL>(new char[newAclSize])};
+ if (!InitializeAcl(newDacl.get(), newAclSize, ACL_REVISION)) {
+ const auto lastError = GetLastError();
+ if (lastError != ERROR_INSUFFICIENT_BUFFER) {
+ qCWarning(lcFileSystem) << "insufficient memory error when calling InitializeAcl" << path;
+ return false;
+ }
+
+ qCWarning(lcFileSystem) << "error when calling InitializeAcl" << path << lastError;
+ return false;
+ }
+
+ if (permissions == FileSystem::FolderPermissions::ReadOnly) {
+ if (!AddAccessDeniedAceEx(newDacl.get(), ACL_REVISION, OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE,
+ FILE_DELETE_CHILD | DELETE | FILE_WRITE_DATA | FILE_WRITE_ATTRIBUTES | FILE_WRITE_EA | FILE_APPEND_DATA, sid)) {
+ qCWarning(lcFileSystem) << "error when calling AddAccessDeniedAce << path" << GetLastError();
+ return false;
+ }
+ }
+
+ for (int i = 0; i < aclSize.AceCount; ++i) {
+ void *currentAce = nullptr;
+ if (!GetAce(resultDacl, i, ¤tAce)) {
+ qCWarning(lcFileSystem) << "error when calling GetAce" << path << GetLastError();
+ return false;
+ }
+
+ const auto currentAceHeader = reinterpret_cast<PACE_HEADER>(currentAce);
+
+ if (permissions == FileSystem::FolderPermissions::ReadWrite && (ACCESS_DENIED_ACE_TYPE == (currentAceHeader->AceType & ACCESS_DENIED_ACE_TYPE))) {
+ qCWarning(lcFileSystem) << "AceHeader" << path << currentAceHeader->AceFlags << currentAceHeader->AceSize << currentAceHeader->AceType;
+ continue;
+ }
+
+ if (!AddAce(newDacl.get(), ACL_REVISION, i + 1, currentAce, currentAceHeader->AceSize)) {
+ const auto lastError = GetLastError();
+ if (lastError != ERROR_INSUFFICIENT_BUFFER) {
+ qCWarning(lcFileSystem) << "insufficient memory error when calling AddAce" << path;
+ return false;
+ }
+
+ if (lastError != ERROR_INVALID_PARAMETER) {
+ qCWarning(lcFileSystem) << "invalid parameter error when calling AddAce" << path << "ACL size" << newAclSize;
+ return false;
+ }
+
+ qCWarning(lcFileSystem) << "error when calling AddAce" << path << lastError << "acl index" << (i + 1);
+ return false;
+ }
+ }
+
+ SECURITY_DESCRIPTOR newSecurityDescriptor;
+ if (!InitializeSecurityDescriptor(&newSecurityDescriptor, SECURITY_DESCRIPTOR_REVISION)) {
+ qCWarning(lcFileSystem) << "error when calling InitializeSecurityDescriptor" << path << GetLastError();
+ return false;
+ }
+
+ if (!SetSecurityDescriptorDacl(&newSecurityDescriptor, true, newDacl.get(), false)) {
+ qCWarning(lcFileSystem) << "error when calling SetSecurityDescriptorDacl" << path << GetLastError();
+ return false;
+ }
+
+ if (safePathFileInfo.isDir() && applyAlsoToFiles) {
+ const auto currentFolder = safePathFileInfo.dir();
+ const auto childFiles = currentFolder.entryList(QDir::Filter::Files);
+ for (const auto &oneEntry : childFiles) {
+ const auto childFile = QDir::toNativeSeparators(path + QDir::separator() + oneEntry);
+
+ const auto &childFileStdWString = childFile.toStdWString();
+ const auto attributes = GetFileAttributes(childFileStdWString.c_str());
+
+ // testing if that could be a pure virtual placeholder file (i.e. CfApi file without data)
+ // we do not want to trigger implicit hydration ourself
+ if ((attributes & FILE_ATTRIBUTE_SPARSE_FILE) != 0) {
+ continue;
+ }
+
+ if (!SetFileSecurityW(childFileStdWString.c_str(), info, &newSecurityDescriptor)) {
+ qCWarning(lcFileSystem) << "error when calling SetFileSecurityW" << childFile << GetLastError();
+ return false;
+ }
+ }
+ }
+
+ if (!SetFileSecurityW(QDir::toNativeSeparators(path).toStdWString().c_str(), info, &newSecurityDescriptor)) {
+ qCWarning(lcFileSystem) << "error when calling SetFileSecurityW" << QDir::toNativeSeparators(path) << GetLastError();
+ return false;
+ }
+
+ return true;
+}
+
#endif
} // namespace OCC
diff -Nru nextcloud-desktop-3.16.4/src/common/filesystembase.h nextcloud-desktop-3.16.6/src/common/filesystembase.h
--- nextcloud-desktop-3.16.4/src/common/filesystembase.h 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/common/filesystembase.h 2025-06-18 22:57:35.000000000 +0200
@@ -176,6 +176,8 @@
std::filesystem::perms OCSYNC_EXPORT filePermissionsWinSymlinkSafe(const QString &filename);
std::filesystem::perms OCSYNC_EXPORT filePermissionsWin(const QString &filename);
void OCSYNC_EXPORT setFilePermissionsWin(const QString &filename, const std::filesystem::perms &perms);
+
+ bool OCSYNC_EXPORT setAclPermission(const QString &path, FileSystem::FolderPermissions permissions, bool applyAlsoToFiles);
#endif
/**
diff -Nru nextcloud-desktop-3.16.4/src/common/remotepermissions.cpp nextcloud-desktop-3.16.6/src/common/remotepermissions.cpp
--- nextcloud-desktop-3.16.4/src/common/remotepermissions.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/common/remotepermissions.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -27,7 +27,7 @@
Q_LOGGING_CATEGORY(lcRemotePermissions, "nextcloud.sync.remotepermissions", QtInfoMsg)
-static const char letters[] = " WDNVCKRSMm";
+static const char letters[] = " GWDNVCKRSMm";
template <typename Char>
diff -Nru nextcloud-desktop-3.16.4/src/common/remotepermissions.h nextcloud-desktop-3.16.6/src/common/remotepermissions.h
--- nextcloud-desktop-3.16.4/src/common/remotepermissions.h 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/common/remotepermissions.h 2025-06-18 22:57:35.000000000 +0200
@@ -41,18 +41,19 @@
public:
enum Permissions {
- CanWrite = 1, // W
- CanDelete = 2, // D
- CanRename = 3, // N
- CanMove = 4, // V
- CanAddFile = 5, // C
- CanAddSubDirectories = 6, // K
- CanReshare = 7, // R
+ CanRead = 1, // G
+ CanWrite, // W
+ CanDelete, // D
+ CanRename, // N
+ CanMove, // V
+ CanAddFile, // C
+ CanAddSubDirectories, // K
+ CanReshare, // R
// Note: on the server, this means SharedWithMe, but in discoveryphase.cpp we also set
// this permission when the server reports the any "share-types"
- IsShared = 8, // S
- IsMounted = 9, // M
- IsMountedSub = 10, // m (internal: set if the parent dir has IsMounted)
+ IsShared, // S
+ IsMounted, // M
+ IsMountedSub, // m (internal: set if the parent dir has IsMounted)
// Note: when adding support for more permissions, we need to invalid the cache in the database.
// (by setting forceRemoteDiscovery in SyncJournalDb::checkConnect)
diff -Nru nextcloud-desktop-3.16.4/src/gui/accountmanager.cpp nextcloud-desktop-3.16.6/src/gui/accountmanager.cpp
--- nextcloud-desktop-3.16.4/src/gui/accountmanager.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/gui/accountmanager.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -254,14 +254,18 @@
}
ConfigFile configFile;
- configFile.setVfsEnabled(settings->value(configFile.isVfsEnabledC).toBool());
- configFile.setLaunchOnSystemStartup(settings->value(configFile.launchOnSystemStartupC).toBool());
- configFile.setOptionalServerNotifications(settings->value(configFile.optionalServerNotificationsC).toBool());
- configFile.setPromptDeleteFiles(settings->value(configFile.promptDeleteC).toBool());
- configFile.setShowCallNotifications(settings->value(configFile.showCallNotificationsC).toBool());
- configFile.setShowChatNotifications(settings->value(configFile.showChatNotificationsC).toBool());
- configFile.setShowInExplorerNavigationPane(settings->value(configFile.showInExplorerNavigationPaneC).toBool());
+ configFile.setVfsEnabled(settings->value(ConfigFile::isVfsEnabledC, configFile.isVfsEnabled()).toBool());
+ configFile.setLaunchOnSystemStartup(settings->value(ConfigFile::launchOnSystemStartupC, configFile.launchOnSystemStartup()).toBool());
+ configFile.setOptionalServerNotifications(settings->value(ConfigFile::optionalServerNotificationsC, configFile.optionalServerNotifications()).toBool());
+ configFile.setPromptDeleteFiles(settings->value(ConfigFile::promptDeleteC, configFile.promptDeleteFiles()).toBool());
+ configFile.setShowCallNotifications(settings->value(ConfigFile::showCallNotificationsC, configFile.showCallNotifications()).toBool());
+ configFile.setShowChatNotifications(settings->value(ConfigFile::showChatNotificationsC, configFile.showChatNotifications()).toBool());
+ configFile.setShowInExplorerNavigationPane(settings->value(ConfigFile::showInExplorerNavigationPaneC, configFile.showInExplorerNavigationPane()).toBool());
ClientProxy().saveProxyConfigurationFromSettings(*settings);
+ configFile.setUseUploadLimit(settings->value(ConfigFile::useUploadLimitC, configFile.useUploadLimit()).toInt());
+ configFile.setUploadLimit(settings->value(ConfigFile::uploadLimitC, configFile.uploadLimit()).toInt());
+ configFile.setUseDownloadLimit(settings->value(ConfigFile::useDownloadLimitC, configFile.useDownloadLimit()).toInt());
+ configFile.setDownloadLimit(settings->value(ConfigFile::downloadLimitC, configFile.downloadLimit()).toInt());
// Try to load the single account.
if (!settings->childKeys().isEmpty()) {
diff -Nru nextcloud-desktop-3.16.4/src/gui/application.cpp nextcloud-desktop-3.16.6/src/gui/application.cpp
--- nextcloud-desktop-3.16.4/src/gui/application.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/gui/application.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -261,21 +261,54 @@
setWindowIcon(_theme->applicationIcon());
if (!ConfigFile().exists()) {
- if (const auto genericConfigLocation = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/" + APPLICATION_CONFIG_NAME;
- setupConfigFolderFromLegacyLocation(genericConfigLocation)) {
- qCWarning(lcApplication) << "Setup of config folder and files from legacy location" << genericConfigLocation << "failed.";
+ setApplicationName(_theme->appNameGUI());
+ QString legacyDir = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/" + APPLICATION_CONFIG_NAME;
+
+ if (legacyDir.endsWith('/')) {
+ legacyDir.chop(1); // macOS 10.11.x does not like trailing slash for rename/move.
}
- } else {
- if (const auto appDataLocation = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
- setupConfigFolderFromLegacyLocation(appDataLocation)) {
- qCWarning(lcApplication) << "Setup of config folder and files from legacy location" << appDataLocation << "failed.";
+ setApplicationName(_theme->appName());
+ if (QFileInfo(legacyDir).isDir()) {
+ auto confDir = ConfigFile().configPath();
+
+ // macOS 10.11.x does not like trailing slash for rename/move.
+ if (confDir.endsWith('/')) {
+ confDir.chop(1);
+ }
+
+ qCInfo(lcApplication) << "Migrating old config from" << legacyDir << "to" << confDir;
+
+ if (!QFile::rename(legacyDir, confDir)) {
+ qCWarning(lcApplication) << "Failed to move the old config directory to its new location (" << legacyDir << "to" << confDir << ")";
+
+ // Try to move the files one by one
+ if (QFileInfo(confDir).isDir() || QDir().mkdir(confDir)) {
+ const QStringList filesList = QDir(legacyDir).entryList(QDir::Files);
+ qCInfo(lcApplication) << "Will move the individual files" << filesList;
+ for (const auto &name : filesList) {
+ if (!QFile::rename(legacyDir + "/" + name, confDir + "/" + name)) {
+ qCWarning(lcApplication) << "Fallback move of " << name << "also failed";
+ }
+ }
+ }
+ } else {
+#ifndef Q_OS_WIN
+ // Create a symbolic link so a downgrade of the client would still find the config.
+ QFile::link(confDir, legacyDir);
+#endif
+ }
}
+ } else {
+ setupConfigFile();
}
- // try to migrate legacy accounts and folders from a previous client version
- // only copy the settings and check what should be skipped
- if (ConfigFile().exists() && !configVersionMigration()) {
- qCWarning(lcApplication) << "Config version migration was not possible.";
+ if (_theme->doNotUseProxy()) {
+ ConfigFile().setProxyType(QNetworkProxy::NoProxy);
+ for (const auto &accountState : AccountManager::instance()->accounts()) {
+ if (accountState && accountState->account()) {
+ accountState->account()->setNetworkProxySetting(Account::AccountNetworkProxySetting::GlobalProxy);
+ }
+ }
}
parseOptions(arguments());
@@ -308,6 +341,12 @@
setupLogging();
setupTranslations();
+ // try to migrate legacy accounts and folders from a previous client version
+ // only copy the settings and check what should be skipped
+ if (!configVersionMigration()) {
+ qCWarning(lcApplication) << "Config version migration was not possible.";
+ }
+
ConfigFile cfg;
{
auto shouldExit = false;
@@ -377,14 +416,6 @@
_gui->setupCloudProviders();
#endif
- if (_theme->doNotUseProxy()) {
- ConfigFile().setProxyType(QNetworkProxy::NoProxy);
- for (const auto &accountState : AccountManager::instance()->accounts()) {
- if (accountState && accountState->account()) {
- accountState->account()->setNetworkProxySetting(Account::AccountNetworkProxySetting::GlobalProxy);
- }
- }
- }
_proxy.setupQtProxyFromConfig(); // folders have to be defined first, than we set up the Qt proxy.
connect(AccountManager::instance(), &AccountManager::accountAdded,
@@ -508,7 +539,7 @@
}
}
-bool Application::setupConfigFolderFromLegacyLocation(const QString &legacyLocation) const
+void Application::setupConfigFile()
{
// Migrate from version <= 2.4
setApplicationName(_theme->appNameGUI());
@@ -520,45 +551,44 @@
QT_WARNING_POP
setApplicationName(_theme->appName());
- auto legacyDir = legacyLocation;
- if (legacyDir.endsWith('/')) {
- legacyDir.chop(1); // macOS 10.11.x does not like trailing slash for rename/move.
+ auto oldDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
+
+ // macOS 10.11.x does not like trailing slash for rename/move.
+ if (oldDir.endsWith('/')) {
+ oldDir.chop(1);
}
- if (!QFileInfo(legacyDir).isDir()) {
- return false;
+ if (!QFileInfo(oldDir).isDir()) {
+ return;
}
auto confDir = ConfigFile().configPath();
+
+ // macOS 10.11.x does not like trailing slash for rename/move.
if (confDir.endsWith('/')) {
confDir.chop(1);
}
- qCInfo(lcApplication) << "Migrating old config from" << legacyDir << "to" << confDir;
- if (!QFile::rename(legacyDir, confDir)) {
- qCWarning(lcApplication) << "Failed to move the old config directory" << legacyDir << "to new location" << confDir;
+ qCInfo(lcApplication) << "Migrating old config from" << oldDir << "to" << confDir;
+ if (!QFile::rename(oldDir, confDir)) {
+ qCWarning(lcApplication) << "Failed to move the old config directory to its new location (" << oldDir << "to" << confDir << ")";
+
+ // Try to move the files one by one
if (QFileInfo(confDir).isDir() || QDir().mkdir(confDir)) {
- const QStringList filesList = QDir(legacyDir).entryList(QDir::Files);
- qCInfo(lcApplication) << "Will move the individual files:" << filesList;
- auto setupCompleted = false;
+ const QStringList filesList = QDir(oldDir).entryList(QDir::Files);
+ qCInfo(lcApplication) << "Will move the individual files" << filesList;
for (const auto &name : filesList) {
- if (!QFile::rename(legacyDir + "/" + name, confDir + "/" + name)) {
- qCDebug(lcApplication) << "Fallback move of " << name << "also failed";
- continue;
+ if (!QFile::rename(oldDir + "/" + name, confDir + "/" + name)) {
+ qCWarning(lcApplication) << "Fallback move of " << name << "also failed";
}
- setupCompleted = true;
- qCInfo(lcApplication) << "Move of " << name << "succeeded.";
}
- return setupCompleted;
}
} else {
#ifndef Q_OS_WIN
// Create a symbolic link so a downgrade of the client would still find the config.
- return QFile::link(confDir, legacyDir);
+ QFile::link(confDir, oldDir);
#endif
}
-
- return false;
}
AccountManager::AccountsRestoreResult Application::restoreLegacyAccount()
diff -Nru nextcloud-desktop-3.16.4/src/gui/application.h nextcloud-desktop-3.16.6/src/gui/application.h
--- nextcloud-desktop-3.16.4/src/gui/application.h 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/gui/application.h 2025-06-18 22:57:35.000000000 +0200
@@ -113,7 +113,7 @@
void handleEditLocallyFromOptions();
AccountManager::AccountsRestoreResult restoreLegacyAccount();
- bool setupConfigFolderFromLegacyLocation(const QString &legacyLocation) const;
+ void setupConfigFile();
void setupAccountsAndFolders();
/**
diff -Nru nextcloud-desktop-3.16.4/src/gui/folder.cpp nextcloud-desktop-3.16.6/src/gui/folder.cpp
--- nextcloud-desktop-3.16.4/src/gui/folder.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/gui/folder.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -998,6 +998,26 @@
}
}
+QString Folder::filePath(const QString& fileName)
+{
+ const auto folderDir = QDir(_canonicalLocalPath);
+
+#ifdef Q_OS_WIN
+ // Edge case time!
+ // QDir::filePath checks whether the passed `fileName` is absolute (essentialy by using `!QFileInfo::isRelative()`).
+ // In the case it's absolute, the `fileName` will be returned instead of the complete file path.
+ //
+ // On Windows, if `fileName` starts with a letter followed by a colon (e.g. "A:BCDEF"), it is considered to be an
+ // absolute path.
+ // Since this method should return the file name file path starting with the canonicalLocalPath, catch that special case here and prefix it ourselves...
+ return fileName.length() >= 2 && fileName[1] == ':'
+ ? _canonicalLocalPath + fileName
+ : folderDir.filePath(fileName);
+#else
+ return folderDir.filePath(fileName);
+#endif
+}
+
bool Folder::isFileExcludedAbsolute(const QString &fullPath) const
{
return _engine->excludedFiles().isExcluded(fullPath, path(), _definition.ignoreHiddenFiles);
diff -Nru nextcloud-desktop-3.16.4/src/gui/folder.h nextcloud-desktop-3.16.6/src/gui/folder.h
--- nextcloud-desktop-3.16.4/src/gui/folder.h 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/gui/folder.h 2025-06-18 22:57:35.000000000 +0200
@@ -165,6 +165,14 @@
*/
[[nodiscard]] QString remotePathTrailingSlash() const;
+ /**
+ * Returns the path name of a file in the local canonical path.
+ *
+ * Similar to `QDir(path()).filePath(...)`, except file names like "Z:test"
+ * are treated as relative paths on Windows.
+ */
+ [[nodiscard]] QString filePath(const QString& fileName);
+
[[nodiscard]] QString fulllRemotePathToPathInSyncJournalDb(const QString &fullRemotePath) const;
void setNavigationPaneClsid(const QUuid &clsid) { _definition.navigationPaneClsid = clsid; }
diff -Nru nextcloud-desktop-3.16.4/src/gui/invalidfilenamedialog.cpp nextcloud-desktop-3.16.6/src/gui/invalidfilenamedialog.cpp
--- nextcloud-desktop-3.16.4/src/gui/invalidfilenamedialog.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/gui/invalidfilenamedialog.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -83,7 +83,9 @@
const auto filePathFileInfo = QFileInfo(_filePath);
_relativeFilePath = filePathFileInfo.path() + QStringLiteral("/");
_relativeFilePath = _relativeFilePath.replace(folder->path(), QStringLiteral(""));
- _relativeFilePath = _relativeFilePath.isEmpty() ? QStringLiteral("") : _relativeFilePath + QStringLiteral("/");
+ if (!(_relativeFilePath.isEmpty() || _relativeFilePath.endsWith(QStringLiteral("/")))) {
+ _relativeFilePath += QStringLiteral("/");
+ }
_originalFileName = _relativeFilePath + filePathFileInfo.fileName();
@@ -97,7 +99,7 @@
switch (invalidMode) {
case InvalidMode::SystemInvalid:
_ui->descriptionLabel->setText(tr("The file \"%1\" could not be synced because the name contains characters which are not allowed on this system.").arg(_originalFileName));
- _ui->explanationLabel->setText(tr("The following characters are not allowed on the system: * \" | & ? , ; : \\ / ~ < > leading/trailing spaces"));
+ _ui->explanationLabel->setText(tr("The following characters are not allowed on the system: \\ / : ? * \" < > | leading/trailing spaces"));
break;
case InvalidMode::ServerInvalid:
_ui->descriptionLabel->setText(tr("The file \"%1\" could not be synced because the name contains characters which are not allowed on the server.").arg(_originalFileName));
@@ -140,7 +142,6 @@
if (_fileLocation == FileLocation::NewLocalFile) {
allowRenaming();
- _ui->errorLabel->setText({});
} else {
checkIfAllowedToRename();
}
@@ -223,6 +224,7 @@
_ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
_ui->filenameLineEdit->setEnabled(true);
_ui->filenameLineEdit->selectAll();
+ _ui->errorLabel->setText({});
const auto filePathFileInfo = QFileInfo(_filePath);
const auto fileName = filePathFileInfo.fileName();
diff -Nru nextcloud-desktop-3.16.4/src/gui/tray/activitydata.cpp nextcloud-desktop-3.16.6/src/gui/tray/activitydata.cpp
--- nextcloud-desktop-3.16.4/src/gui/tray/activitydata.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/gui/tray/activitydata.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -130,7 +130,6 @@
auto word = match.captured(1);
word.remove(subjectRichParameterBracesRe);
- Q_ASSERT(activity._subjectRichParameters.contains(word));
displayString = displayString.replace(match.captured(1), activity._subjectRichParameters[word].value<Activity::RichSubjectParameter>().name);
}
diff -Nru nextcloud-desktop-3.16.4/src/gui/tray/activitylistmodel.cpp nextcloud-desktop-3.16.6/src/gui/tray/activitylistmodel.cpp
--- nextcloud-desktop-3.16.4/src/gui/tray/activitylistmodel.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/gui/tray/activitylistmodel.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -166,7 +166,7 @@
// If this is an E2EE file or folder, pretend we got no path, hiding the share button which is what we want
if (folder) {
SyncJournalFileRecord rec;
- if (!folder->journalDb()->getFileRecord(fileName.mid(1), &rec)) {
+ if (!folder->journalDb()->getFileRecord(relPath.mid(1), &rec)) {
qCWarning(lcActivity) << "could not get file from local DB" << fileName.mid(1);
}
if (rec.isValid() && (rec.isE2eEncrypted() || !rec._e2eMangledName.isEmpty())) {
@@ -686,7 +686,6 @@
}
auto folder = FolderMan::instance()->folder(activity._folder);
- const auto folderDir = QDir(folder->path());
const auto fileLocation = activity._syncFileItemStatus == SyncFileItem::FileNameInvalidOnServer
? InvalidFilenameDialog::FileLocation::NewLocalFile
: InvalidFilenameDialog::FileLocation::Default;
@@ -695,7 +694,7 @@
: InvalidFilenameDialog::InvalidMode::SystemInvalid;
_currentInvalidFilenameDialog = new InvalidFilenameDialog(_accountState->account(), folder,
- folderDir.filePath(activity._file), fileLocation, invalidMode);
+ folder->filePath(activity._file), fileLocation, invalidMode);
connect(_currentInvalidFilenameDialog, &InvalidFilenameDialog::accepted, folder, [folder]() {
folder->scheduleThisFolderSoon();
});
diff -Nru nextcloud-desktop-3.16.4/src/libsync/configfile.cpp nextcloud-desktop-3.16.6/src/libsync/configfile.cpp
--- nextcloud-desktop-3.16.4/src/libsync/configfile.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/libsync/configfile.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -83,11 +83,6 @@
static constexpr char proxyPassC[] = "Proxy/pass";
static constexpr char proxyNeedsAuthC[] = "Proxy/needsAuth";
-static constexpr char useUploadLimitC[] = "BWLimit/useUploadLimit";
-static constexpr char useDownloadLimitC[] = "BWLimit/useDownloadLimit";
-static constexpr char uploadLimitC[] = "BWLimit/uploadLimit";
-static constexpr char downloadLimitC[] = "BWLimit/downloadLimit";
-
static constexpr char newBigFolderSizeLimitC[] = "newBigFolderSizeLimit";
static constexpr char useNewBigFolderSizeLimitC[] = "useNewBigFolderSizeLimit";
static constexpr char notifyExistingFoldersOverLimitC[] = "notifyExistingFoldersOverLimit";
diff -Nru nextcloud-desktop-3.16.4/src/libsync/configfile.h nextcloud-desktop-3.16.6/src/libsync/configfile.h
--- nextcloud-desktop-3.16.4/src/libsync/configfile.h 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/libsync/configfile.h 2025-06-18 22:57:35.000000000 +0200
@@ -260,6 +260,11 @@
static constexpr char showChatNotificationsC[] = "showChatNotifications";
static constexpr char showInExplorerNavigationPaneC[] = "showInExplorerNavigationPane";
+ static constexpr char useUploadLimitC[] = "BWLimit/useUploadLimit";
+ static constexpr char useDownloadLimitC[] = "BWLimit/useDownloadLimit";
+ static constexpr char uploadLimitC[] = "BWLimit/uploadLimit";
+ static constexpr char downloadLimitC[] = "BWLimit/downloadLimit";
+
protected:
[[nodiscard]] QVariant getPolicySetting(const QString &policy, const QVariant &defaultValue = QVariant()) const;
void storeData(const QString &group, const QString &key, const QVariant &value);
diff -Nru nextcloud-desktop-3.16.4/src/libsync/discovery.cpp nextcloud-desktop-3.16.6/src/libsync/discovery.cpp
--- nextcloud-desktop-3.16.4/src/libsync/discovery.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/libsync/discovery.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -858,6 +858,9 @@
item->_modtime = serverEntry.modtime;
item->_size = sizeOnServer;
item->_instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
+ } else if (serverEntry.isValid() && !serverEntry.isDirectory && !serverEntry.remotePerm.isNull() && !serverEntry.remotePerm.hasPermission(RemotePermissions::CanRead)) {
+ item->_instruction = CSYNC_INSTRUCTION_REMOVE;
+ item->_direction = SyncFileItem::Down;
} else if (dbEntry._remotePerm != serverEntry.remotePerm || dbEntry._fileId != serverEntry.fileId || metaDataSizeNeedsUpdateForE2EeFilePlaceholder) {
if (metaDataSizeNeedsUpdateForE2EeFilePlaceholder) {
// we are updating placeholder sizes after migrating from older versions with VFS + E2EE implicit hydration not supported
@@ -920,6 +923,13 @@
return;
}
+
+ if (serverEntry.isValid() && !serverEntry.isDirectory && !serverEntry.remotePerm.isNull() && !serverEntry.remotePerm.hasPermission(RemotePermissions::CanRead)) {
+ item->_instruction = CSYNC_INSTRUCTION_IGNORE;
+ emit _discoveryData->itemDiscovered(item);
+
+ return;
+ }
// Potential NEW/NEW conflict is handled in AnalyzeLocal
if (localEntry.isValid()) {
diff -Nru nextcloud-desktop-3.16.4/src/libsync/discoveryphase.cpp nextcloud-desktop-3.16.6/src/libsync/discoveryphase.cpp
--- nextcloud-desktop-3.16.4/src/libsync/discoveryphase.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/libsync/discoveryphase.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -180,11 +180,10 @@
result = true;
oldEtag = (*it)->_etag;
} else {
- if (!(instruction == CSYNC_INSTRUCTION_REMOVE
- // re-creation of virtual files count as a delete
- || ((*it)->_type == ItemTypeVirtualFile && instruction == CSYNC_INSTRUCTION_NEW)
- || ((*it)->_isRestoration && instruction == CSYNC_INSTRUCTION_NEW)))
- {
+ if (!(instruction == CSYNC_INSTRUCTION_REMOVE ||
+ instruction == CSYNC_INSTRUCTION_IGNORE ||
+ ((*it)->_type == ItemTypeVirtualFile && instruction == CSYNC_INSTRUCTION_NEW) ||// re-creation of virtual files count as a delete
+ ((*it)->_isRestoration && instruction == CSYNC_INSTRUCTION_NEW))) {
qCWarning(lcDiscovery) << "ENFORCE(FAILING)" << originalPath;
qCWarning(lcDiscovery) << "instruction == CSYNC_INSTRUCTION_REMOVE" << (instruction == CSYNC_INSTRUCTION_REMOVE);
qCWarning(lcDiscovery) << "((*it)->_type == ItemTypeVirtualFile && instruction == CSYNC_INSTRUCTION_NEW)"
diff -Nru nextcloud-desktop-3.16.4/src/libsync/filesystem.cpp nextcloud-desktop-3.16.6/src/libsync/filesystem.cpp
--- nextcloud-desktop-3.16.4/src/libsync/filesystem.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/libsync/filesystem.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -353,137 +353,61 @@
}
bool FileSystem::setFolderPermissions(const QString &path,
- FileSystem::FolderPermissions permissions) noexcept
+ FileSystem::FolderPermissions permissions,
+ bool * const permissionsChanged) noexcept
{
-#ifdef Q_OS_WIN
- SECURITY_INFORMATION info = DACL_SECURITY_INFORMATION;
- std::unique_ptr<char[]> securityDescriptor;
- auto neededLength = 0ul;
-
- if (!GetFileSecurityW(path.toStdWString().c_str(), info, nullptr, 0, &neededLength)) {
- const auto lastError = GetLastError();
- if (lastError != ERROR_INSUFFICIENT_BUFFER) {
- qCWarning(lcFileSystem) << "error when calling GetFileSecurityW" << path << lastError;
- return false;
- }
-
- securityDescriptor.reset(new char[neededLength]);
-
- if (!GetFileSecurityW(path.toStdWString().c_str(), info, securityDescriptor.get(), neededLength, &neededLength)) {
- qCWarning(lcFileSystem) << "error when calling GetFileSecurityW" << path << GetLastError();
- return false;
- }
- }
+ bool permissionsDidChange = false;
- int daclPresent = false, daclDefault = false;
- PACL resultDacl = nullptr;
- if (!GetSecurityDescriptorDacl(securityDescriptor.get(), &daclPresent, &resultDacl, &daclDefault)) {
- qCWarning(lcFileSystem) << "error when calling GetSecurityDescriptorDacl" << path << GetLastError();
- return false;
- }
- if (!daclPresent || !resultDacl) {
- qCWarning(lcFileSystem) << "error when calling DACL needed to set a folder read-only or read-write is missing" << path;
- return false;
+ if (permissionsChanged) {
+ *permissionsChanged = false;
}
- PSID sid = nullptr;
- if (!ConvertStringSidToSidW(L"S-1-5-32-545", &sid))
- {
- qCWarning(lcFileSystem) << "error when calling ConvertStringSidToSidA" << path << GetLastError();
- return false;
- }
-
- ACL_SIZE_INFORMATION aclSize;
- if (!GetAclInformation(resultDacl, &aclSize, sizeof(aclSize), AclSizeInformation)) {
- qCWarning(lcFileSystem) << "error when calling GetAclInformation" << path << GetLastError();
- return false;
- }
-
- const auto newAclSize = aclSize.AclBytesInUse + sizeof(ACCESS_DENIED_ACE) + GetLengthSid(sid);
- qCDebug(lcFileSystem) << "allocated a new DACL object of size" << newAclSize;
-
- std::unique_ptr<ACL> newDacl{reinterpret_cast<PACL>(new char[newAclSize])};
- if (!InitializeAcl(newDacl.get(), newAclSize, ACL_REVISION)) {
- const auto lastError = GetLastError();
- if (lastError != ERROR_INSUFFICIENT_BUFFER) {
- qCWarning(lcFileSystem) << "insufficient memory error when calling InitializeAcl" << path;
- return false;
- }
-
- qCWarning(lcFileSystem) << "error when calling InitializeAcl" << path << lastError;
- return false;
- }
+#ifdef Q_OS_WIN
+ // current read-only folder ACL needs to be removed from files also when making a folder read-write
+ // we currently have a too limited set of authorization for files when applying the restrictive ACL for folders on the child files
+ setFileReadOnly(path, permissions == FileSystem::FolderPermissions::ReadOnly);
+ setAclPermission(path, permissions, permissions == FileSystem::FolderPermissions::ReadWrite ? true : false);
- if (permissions == FileSystem::FolderPermissions::ReadOnly) {
- qCInfo(lcFileSystem) << path << "will be read only";
- if (!AddAccessDeniedAce(newDacl.get(), ACL_REVISION, FILE_WRITE_DATA | FILE_WRITE_ATTRIBUTES | FILE_WRITE_EA | FILE_APPEND_DATA | FILE_DELETE_CHILD, sid)) {
- qCWarning(lcFileSystem) << "error when calling AddAccessDeniedAce << path" << GetLastError();
- return false;
- }
- }
+ permissionsDidChange = true;
+#else
+ static constexpr auto writePerms = std::filesystem::perms::owner_write | std::filesystem::perms::group_write | std::filesystem::perms::others_write;
+ const auto stdStrPath = path.toStdWString();
- if (permissions == FileSystem::FolderPermissions::ReadWrite) {
- qCInfo(lcFileSystem) << path << "will be read write";
- }
+ const auto currentPermissions = std::filesystem::status(stdStrPath).permissions();
+ qCDebug(lcFileSystem()).nospace() << "current permissions path=" << path << " perms=" << Qt::showbase << Qt::oct << static_cast<int>(currentPermissions);
- for (int i = 0; i < aclSize.AceCount; ++i) {
- void *currentAce = nullptr;
- if (!GetAce(resultDacl, i, ¤tAce)) {
- qCWarning(lcFileSystem) << "error when calling GetAce" << path << GetLastError();
- return false;
- }
+ try
+ {
+ switch (permissions) {
+ case OCC::FileSystem::FolderPermissions::ReadOnly: {
+ qCDebug(lcFileSystem()).nospace() << "ensuring folder is read only path=" << path;
- const auto currentAceHeader = reinterpret_cast<PACE_HEADER>(currentAce);
+ if ((currentPermissions & writePerms) != std::filesystem::perms::none) {
+ qCDebug(lcFileSystem()).nospace() << "removing owner/group/others write permissions path=" << path;
+ std::filesystem::permissions(stdStrPath, writePerms, std::filesystem::perm_options::remove);
+ permissionsDidChange = true;
+ }
- if (permissions == FileSystem::FolderPermissions::ReadWrite && (ACCESS_DENIED_ACE_TYPE == (currentAceHeader->AceType & ACCESS_DENIED_ACE_TYPE))) {
- qCWarning(lcFileSystem) << "AceHeader" << path << currentAceHeader->AceFlags << currentAceHeader->AceSize << currentAceHeader->AceType;
- continue;
+ break;
}
+ case OCC::FileSystem::FolderPermissions::ReadWrite: {
+ qCDebug(lcFileSystem()).nospace() << "ensuring folder is read/writable path=" << path;
- if (!AddAce(newDacl.get(), ACL_REVISION, i + 1, currentAce, currentAceHeader->AceSize)) {
- const auto lastError = GetLastError();
- if (lastError != ERROR_INSUFFICIENT_BUFFER) {
- qCWarning(lcFileSystem) << "insufficient memory error when calling AddAce" << path;
- return false;
+ if ((currentPermissions & std::filesystem::perms::others_write) != std::filesystem::perms::none) {
+ qCDebug(lcFileSystem()).nospace() << "removing others write permissions path=" << path;
+ std::filesystem::permissions(stdStrPath, std::filesystem::perms::others_write, std::filesystem::perm_options::remove);
+ permissionsDidChange = true;
}
- if (lastError != ERROR_INVALID_PARAMETER) {
- qCWarning(lcFileSystem) << "invalid parameter error when calling AddAce" << path << "ACL size" << newAclSize;
- return false;
+ if ((currentPermissions & std::filesystem::perms::owner_write) == std::filesystem::perms::none) {
+ qCDebug(lcFileSystem()).nospace() << "adding owner write permissions path=" << path;
+ std::filesystem::permissions(stdStrPath, std::filesystem::perms::owner_write, std::filesystem::perm_options::add);
+ permissionsDidChange = true;
}
- qCWarning(lcFileSystem) << "error when calling AddAce" << path << lastError << "acl index" << (i + 1);
- return false;
- }
- }
-
- SECURITY_DESCRIPTOR newSecurityDescriptor;
- if (!InitializeSecurityDescriptor(&newSecurityDescriptor, SECURITY_DESCRIPTOR_REVISION)) {
- qCWarning(lcFileSystem) << "error when calling InitializeSecurityDescriptor" << path << GetLastError();
- return false;
- }
-
- if (!SetSecurityDescriptorDacl(&newSecurityDescriptor, true, newDacl.get(), false)) {
- qCWarning(lcFileSystem) << "error when calling SetSecurityDescriptorDacl" << path << GetLastError();
- return false;
- }
-
- if (!SetFileSecurityW(path.toStdWString().c_str(), info, &newSecurityDescriptor)) {
- qCWarning(lcFileSystem) << "error when calling SetFileSecurityW" << path << GetLastError();
- return false;
- }
-#else
- static constexpr auto writePerms = std::filesystem::perms::owner_write | std::filesystem::perms::group_write | std::filesystem::perms::others_write;
- const auto stdStrPath = path.toStdWString();
- try
- {
- switch (permissions) {
- case OCC::FileSystem::FolderPermissions::ReadOnly:
- std::filesystem::permissions(stdStrPath, writePerms, std::filesystem::perm_options::remove);
- break;
- case OCC::FileSystem::FolderPermissions::ReadWrite:
break;
}
+ }
}
catch (const std::filesystem::filesystem_error &e)
{
@@ -501,34 +425,16 @@
return false;
}
- try
- {
- switch (permissions) {
- case OCC::FileSystem::FolderPermissions::ReadOnly:
- break;
- case OCC::FileSystem::FolderPermissions::ReadWrite:
- std::filesystem::permissions(stdStrPath, std::filesystem::perms::others_write, std::filesystem::perm_options::remove);
- std::filesystem::permissions(stdStrPath, std::filesystem::perms::owner_write, std::filesystem::perm_options::add);
- break;
- }
- }
- catch (const std::filesystem::filesystem_error &e)
- {
- qCWarning(lcFileSystem()) << "exception when modifying folder permissions" << e.what() << e.path1().c_str() << e.path2().c_str();
- return false;
- }
- catch (const std::system_error &e)
- {
- qCWarning(lcFileSystem()) << "exception when modifying folder permissions" << e.what() << "- path:" << stdStrPath;
- return false;
- }
- catch (...)
- {
- qCWarning(lcFileSystem()) << "exception when modifying folder permissions - path:" << stdStrPath;
- return false;
+ if (permissionsDidChange) {
+ const auto newPermissions = std::filesystem::status(stdStrPath).permissions();
+ qCDebug(lcFileSystem()).nospace() << "updated permissions path=" << path << " perms=" << Qt::showbase << Qt::oct << static_cast<int>(newPermissions);
}
#endif
+ if (permissionsChanged) {
+ *permissionsChanged = permissionsDidChange;
+ }
+
return true;
}
@@ -626,12 +532,13 @@
{
try
{
- const auto stdStrPath = _path.toStdWString();
- _initialPermissions = FileSystem::isFolderReadOnly(stdStrPath) ? OCC::FileSystem::FolderPermissions::ReadOnly : OCC::FileSystem::FolderPermissions::ReadWrite;
- if (_initialPermissions != temporaryPermissions) {
+ const auto &stdStrPath = _path.toStdWString();
+ const auto fsPath = std::filesystem::path{stdStrPath};
+ if ((temporaryPermissions == OCC::FileSystem::FolderPermissions::ReadOnly && !FileSystem::isFolderReadOnly(fsPath)) ||
+ (temporaryPermissions == OCC::FileSystem::FolderPermissions::ReadWrite && FileSystem::isFolderReadOnly(fsPath))) {
+ FileSystem::setFolderPermissions(_path, temporaryPermissions);
_rollbackNeeded = true;
}
- FileSystem::setFolderPermissions(_path, temporaryPermissions);
}
catch (const std::filesystem::filesystem_error &e)
{
diff -Nru nextcloud-desktop-3.16.4/src/libsync/filesystem.h nextcloud-desktop-3.16.6/src/libsync/filesystem.h
--- nextcloud-desktop-3.16.4/src/libsync/filesystem.h 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/libsync/filesystem.h 2025-06-18 22:57:35.000000000 +0200
@@ -127,7 +127,8 @@
const std::function<void(const QString &path, bool isDir)> &onError = nullptr);
bool OWNCLOUDSYNC_EXPORT setFolderPermissions(const QString &path,
- FileSystem::FolderPermissions permissions) noexcept;
+ FileSystem::FolderPermissions permissions,
+ bool *permissionsChanged = nullptr) noexcept;
bool OWNCLOUDSYNC_EXPORT isFolderReadOnly(const std::filesystem::path &path) noexcept;
diff -Nru nextcloud-desktop-3.16.4/src/libsync/lockfilejobs.cpp nextcloud-desktop-3.16.6/src/libsync/lockfilejobs.cpp
--- nextcloud-desktop-3.16.4/src/libsync/lockfilejobs.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/libsync/lockfilejobs.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -16,6 +16,7 @@
#include "account.h"
#include "common/syncjournaldb.h"
+#include "common/syncjournalfilerecord.h"
#include "filesystem.h"
#include <QLoggingCategory>
@@ -49,7 +50,16 @@
void LockFileJob::start()
{
- qCInfo(lcLockFileJob()) << "start with path:" << path()
+ auto remotePath = path();
+
+ SyncJournalFileRecord record;
+ const auto relativePathInDb = path().mid(_remoteSyncPathWithTrailingSlash.size());
+ if (_journal->getFileRecord(relativePathInDb, &record) && record.isValid() && record.isE2eEncrypted()) {
+ remotePath = _remoteSyncPathWithTrailingSlash + record.e2eMangledName();
+ qCDebug(lcLockFileJob).nospace() << "will (un)lock e2ee file path=" << path() << " remotePath=" << remotePath;
+ }
+
+ qCInfo(lcLockFileJob()) << "start with path:" << remotePath
<< "lock state:" << _requestedLockState
<< "lock owner type:" << _requestedLockOwnerType;
@@ -77,7 +87,7 @@
verb = "UNLOCK";
break;
}
- sendRequest(verb, makeDavUrl(path()), request);
+ sendRequest(verb, makeDavUrl(remotePath), request);
AbstractNetworkJob::start();
}
diff -Nru nextcloud-desktop-3.16.4/src/libsync/owncloudpropagator.cpp nextcloud-desktop-3.16.6/src/libsync/owncloudpropagator.cpp
--- nextcloud-desktop-3.16.4/src/libsync/owncloudpropagator.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/libsync/owncloudpropagator.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -1293,9 +1293,11 @@
// Delete the job and remove it from our list of jobs.
subJob->deleteLater();
- int i = _runningJobs.indexOf(subJob);
- Q_ASSERT(i >= 0); // should only happen if this function is called more than once
- _runningJobs.remove(i);
+ const auto i = _runningJobs.indexOf(subJob);
+ Q_ASSERT(i >= 0 && i < _runningJobs.size()); // should only happen if this function is called more than once
+ if (i >= 0 && i < _runningJobs.size()) {
+ _runningJobs.remove(i);
+ }
// Any sub job error will cause the whole composite to fail. This is important
// for knowing whether to update the etag in PropagateDirectory, for example.
@@ -1468,11 +1470,14 @@
!_item->_remotePerm.hasPermission(RemotePermissions::CanAddFile) &&
!_item->_remotePerm.hasPermission(RemotePermissions::CanAddSubDirectories)) {
try {
- if (FileSystem::fileExists(propagator()->fullLocalPath(_item->_file))) {
- FileSystem::setFolderPermissions(propagator()->fullLocalPath(_item->_file), FileSystem::FolderPermissions::ReadOnly);
+ if (const auto fileName = propagator()->fullLocalPath(_item->_file); FileSystem::fileExists(fileName)) {
+ FileSystem::setFolderPermissions(fileName, FileSystem::FolderPermissions::ReadOnly);
+ Q_EMIT propagator()->touchedFile(fileName);
}
if (!_item->_renameTarget.isEmpty() && FileSystem::fileExists(propagator()->fullLocalPath(_item->_renameTarget))) {
- FileSystem::setFolderPermissions(propagator()->fullLocalPath(_item->_renameTarget), FileSystem::FolderPermissions::ReadOnly);
+ const auto fileName = propagator()->fullLocalPath(_item->_renameTarget);
+ FileSystem::setFolderPermissions(fileName, FileSystem::FolderPermissions::ReadOnly);
+ Q_EMIT propagator()->touchedFile(fileName);
}
}
catch (const std::filesystem::filesystem_error &e)
@@ -1495,10 +1500,11 @@
}
} else {
try {
- const auto permissionsChangeHelper = [] (const auto fileName)
+ const auto permissionsChangeHelper = [this] (const auto fileName)
{
qCDebug(lcDirectory) << fileName << "permissions changed: old permissions" << static_cast<int>(std::filesystem::status(fileName.toStdWString()).permissions());
FileSystem::setFolderPermissions(fileName, FileSystem::FolderPermissions::ReadWrite);
+ Q_EMIT propagator()->touchedFile(fileName);
qCDebug(lcDirectory) << fileName << "applied new permissions" << static_cast<int>(std::filesystem::status(fileName.toStdWString()).permissions());
};
diff -Nru nextcloud-desktop-3.16.4/src/libsync/propagateremotemove.cpp nextcloud-desktop-3.16.6/src/libsync/propagateremotemove.cpp
--- nextcloud-desktop-3.16.4/src/libsync/propagateremotemove.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/libsync/propagateremotemove.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -209,7 +209,9 @@
&propagator()->_anotherSyncNeeded);
const auto filePath = propagator()->fullLocalPath(_item->_renameTarget);
const auto filePathOriginal = propagator()->fullLocalPath(_item->_originalFile);
+ const auto oldFile = QFileInfo{filePathOriginal};
QFile file(filePath);
+ auto permissionsHandler = FileSystem::FilePermissionsRestore{oldFile.absolutePath(), FileSystem::FolderPermissions::ReadWrite};
if (!file.rename(filePathOriginal)) {
qCWarning(lcPropagateRemoteMove) << "Could not MOVE file" << filePathOriginal << " to" << filePath
<< " with error:" << _job->errorString() << " and failed to restore it !";
diff -Nru nextcloud-desktop-3.16.4/src/libsync/propagatorjobs.cpp nextcloud-desktop-3.16.6/src/libsync/propagatorjobs.cpp
--- nextcloud-desktop-3.16.4/src/libsync/propagatorjobs.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/libsync/propagatorjobs.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -107,26 +107,60 @@
}
QString removeError;
- if (_moveToTrash && propagator()->syncOptions()._vfs->mode() != OCC::Vfs::WindowsCfApi) {
- if ((QDir(filename).exists() || FileSystem::fileExists(filename))
- && !FileSystem::moveToTrash(filename, &removeError)) {
- done(SyncFileItem::NormalError, tr("Temporary error when removing local item removed from server."), ErrorCategory::GenericError);
- return;
+ auto moveToTrashIsFeasible = true;
+ if (propagator()->syncOptions()._vfs->mode() != OCC::Vfs::WindowsCfApi) {
+ moveToTrashIsFeasible = false;
+ }
+ const auto fileInfo = QFileInfo{filename};
+ if (fileInfo.isDir()) {
+ try {
+ if (FileSystem::isFolderReadOnly(fileInfo.filesystemAbsolutePath())) {
+ moveToTrashIsFeasible = false;
+ }
+ }
+ catch (const std::filesystem::filesystem_error &e)
+ {
+ qCWarning(lcPropagateLocalRemove) << "exception when checking parent folder read only status" << e.what() << e.path1().c_str() << e.path2().c_str();
+ }
+ catch (const std::system_error &e)
+ {
+ qCWarning(lcPropagateLocalRemove) << "exception when checking parent folder read only status" << e.what();
+ }
+ catch (...)
+ {
+ qCWarning(lcPropagateLocalRemove) << "exception when checking parent folder read only status";
+ }
+ } else {
+ if (!FileSystem::isWritable(filename, fileInfo)) {
+ moveToTrashIsFeasible = false;
+ }
+ }
+ if (_moveToTrash && moveToTrashIsFeasible) {
+ if (FileSystem::fileExists(filename, fileInfo)) {
+ const auto parentFolderPath = fileInfo.dir().absolutePath();
+ const auto parentPermissionsHandler = FileSystem::FilePermissionsRestore{parentFolderPath, FileSystem::FolderPermissions::ReadWrite};
+
+ if (!FileSystem::moveToTrash(filename, &removeError)) {
+ qCWarning(lcPropagateLocalRemove()) << "move to trash failed" << filename << removeError;
+ done(SyncFileItem::NormalError, tr("Temporary error when removing local item removed from server."), ErrorCategory::GenericError);
+ return;
+ }
+ } else {
+ qCWarning(lcPropagateLocalRemove()) << "move to trash failed" << filename << "was already deleted";
}
} else {
if (_item->isDirectory()) {
- if (QDir(filename).exists() && !removeRecursively(QString())) {
+ if (FileSystem::fileExists(filename, fileInfo) && !removeRecursively(QString())) {
done(SyncFileItem::NormalError, tr("Temporary error when removing local item removed from server."), ErrorCategory::GenericError);
return;
}
} else {
- if (FileSystem::fileExists(filename)) {
- const auto fileInfo = QFileInfo{filename};
+ if (FileSystem::fileExists(filename, fileInfo)) {
const auto parentFolderPath = fileInfo.dir().absolutePath();
-
const auto parentPermissionsHandler = FileSystem::FilePermissionsRestore{parentFolderPath, FileSystem::FolderPermissions::ReadWrite};
if (!FileSystem::remove(filename, &removeError)) {
+ qCWarning(lcPropagateLocalRemove()) << "remove failed" << filename << removeError;
done(SyncFileItem::NormalError, tr("Temporary error when removing local item removed from server."), ErrorCategory::GenericError);
return;
}
diff -Nru nextcloud-desktop-3.16.4/src/libsync/vfs/cfapi/shellext/CfApiShellIntegration.rc nextcloud-desktop-3.16.6/src/libsync/vfs/cfapi/shellext/CfApiShellIntegration.rc
--- nextcloud-desktop-3.16.4/src/libsync/vfs/cfapi/shellext/CfApiShellIntegration.rc 1970-01-01 01:00:00.000000000 +0100
+++ nextcloud-desktop-3.16.6/src/libsync/vfs/cfapi/shellext/CfApiShellIntegration.rc 2025-06-18 22:57:35.000000000 +0200
@@ -0,0 +1,64 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+// Microsoft Visual C++ generated resource script.
+//
+#include "CfApiShellIntegrationVersion.h"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "windows.h"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION NCEXT_VERSION
+ PRODUCTVERSION NCEXT_VERSION
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "CompanyName", "Nextcloud GmbH"
+ VALUE "FileDescription", "Nextcloud CfApi shell extension"
+ VALUE "FileVersion", NCEXT_VERSION_STRING
+ VALUE "InternalName", "NCOverlays"
+ VALUE "LegalCopyright", "Copyright (C) 2023 Nextcloud GmbH"
+ VALUE "ProductName", "Nextcloud shell extension"
+ VALUE "ProductVersion", NCEXT_VERSION_STRING
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
diff -Nru nextcloud-desktop-3.16.4/src/libsync/vfs/cfapi/shellext/CfApiShellIntegrationVersion.h.in nextcloud-desktop-3.16.6/src/libsync/vfs/cfapi/shellext/CfApiShellIntegrationVersion.h.in
--- nextcloud-desktop-3.16.4/src/libsync/vfs/cfapi/shellext/CfApiShellIntegrationVersion.h.in 1970-01-01 01:00:00.000000000 +0100
+++ nextcloud-desktop-3.16.6/src/libsync/vfs/cfapi/shellext/CfApiShellIntegrationVersion.h.in 2025-06-18 22:57:35.000000000 +0200
@@ -0,0 +1,14 @@
+#pragma once
+
+// SPDX-FileCopyrightText: 2016 ownCloud GmbH
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+// This is the number that will end up in the version window of the DLLs.
+// Increment this version before committing a new build if you are today's shell_integration build master.
+#cmakedefine NCEXT_BUILD_NUM @NCEXT_BUILD_NUM@
+
+#define STRINGIZE2(s) #s
+#define STRINGIZE(s) STRINGIZE2(s)
+
+#cmakedefine NCEXT_VERSION @NCEXT_VERSION@
+#define NCEXT_VERSION_STRING STRINGIZE(NCEXT_VERSION)
diff -Nru nextcloud-desktop-3.16.4/src/libsync/vfs/cfapi/shellext/CMakeLists.txt nextcloud-desktop-3.16.6/src/libsync/vfs/cfapi/shellext/CMakeLists.txt
--- nextcloud-desktop-3.16.4/src/libsync/vfs/cfapi/shellext/CMakeLists.txt 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/src/libsync/vfs/cfapi/shellext/CMakeLists.txt 2025-06-18 22:57:35.000000000 +0200
@@ -153,6 +153,8 @@
message("cppWinRtExe: ${cppWinRtExe}")
message("midlExe: ${midlExe}")
+configure_file(CfApiShellIntegrationVersion.h.in ${CMAKE_CURRENT_BINARY_DIR}/CfApiShellIntegrationVersion.h)
+
# use midl.exe and cppwinrt.exe to generate files for CustomStateProvider (WinRT class)
add_custom_command(OUTPUT ${MidlOutputPathHeader}
COMMAND ${midlExe} /winrt /h nul /tlb ${MidlOutputPathTlb} /winmd ${MidlOutputPathWinmd} /metadata_dir "${WindowsSDKReferencesPath}\\Windows.Foundation.FoundationContract\\${WindowsFoundationContractVersion}" /nomidl /reference "${WindowsSDKReferencesPath}\\Windows.Foundation.FoundationContract\\${WindowsFoundationContractVersion}\\Windows.Foundation.FoundationContract.winmd" /reference "${WindowsSDKReferencesPath}\\Windows.Storage.Provider.CloudFilesContract\\${WindowsStorageProviderCloudFilesContractVersion}\\Windows.Storage.Provider.CloudFilesContract.winmd" /I ${MidleFileFolder} customstateprovider.idl
@@ -170,6 +172,7 @@
${CMAKE_SOURCE_DIR}/src/common/shellextensionutils.cpp
customstateprovider.cpp
CfApiShellIntegration.def
+ CfApiShellIntegration.rc
)
message("CUSTOM_STATE_ICON_LOCKED_OUT: ${CUSTOM_STATE_ICON_LOCKED_OUT}")
diff -Nru nextcloud-desktop-3.16.4/.tag nextcloud-desktop-3.16.6/.tag
--- nextcloud-desktop-3.16.4/.tag 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/.tag 2025-06-18 22:57:35.000000000 +0200
@@ -1 +1 @@
-0febbee77be35f9a17f591b22767e1500192d14f
+957b27497fbe7ca14c26a45e6967a097b96a0add
diff -Nru nextcloud-desktop-3.16.4/test/CMakeLists.txt nextcloud-desktop-3.16.6/test/CMakeLists.txt
--- nextcloud-desktop-3.16.4/test/CMakeLists.txt 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/test/CMakeLists.txt 2025-06-18 22:57:35.000000000 +0200
@@ -95,6 +95,8 @@
nextcloud_add_test(DateFieldBackend)
nextcloud_add_test(ClientStatusReporting)
+nextcloud_add_test(FileSystem)
+
nextcloud_add_test(FolderStatusModel)
target_link_libraries(SecureFileDropTest PRIVATE Nextcloud::sync)
diff -Nru nextcloud-desktop-3.16.4/test/sharetestutils.cpp nextcloud-desktop-3.16.6/test/sharetestutils.cpp
--- nextcloud-desktop-3.16.4/test/sharetestutils.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/test/sharetestutils.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -153,6 +153,7 @@
const auto fakeFileInfo = fakeFolder.remoteModifier().find(testFileName);
QVERIFY(fakeFileInfo);
+ fakeFileInfo->permissions.setPermission(RemotePermissions::CanRead);
fakeFileInfo->permissions.setPermission(RemotePermissions::CanReshare);
QVERIFY(fakeFolder.syncOnce());
QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
diff -Nru nextcloud-desktop-3.16.4/test/syncenginetestutils.cpp nextcloud-desktop-3.16.6/test/syncenginetestutils.cpp
--- nextcloud-desktop-3.16.4/test/syncenginetestutils.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/test/syncenginetestutils.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -406,7 +406,7 @@
xml.writeTextElement(davUri, QStringLiteral("getlastmodified"), stringDate);
xml.writeTextElement(davUri, QStringLiteral("getcontentlength"), QString::number(fileInfo.size));
xml.writeTextElement(davUri, QStringLiteral("getetag"), QStringLiteral("\"%1\"").arg(QString::fromLatin1(fileInfo.etag)));
- xml.writeTextElement(ocUri, QStringLiteral("permissions"), !fileInfo.permissions.isNull() ? QString(fileInfo.permissions.toString()) : fileInfo.isShared ? QStringLiteral("SRDNVCKW") : QStringLiteral("RDNVCKW"));
+ xml.writeTextElement(ocUri, QStringLiteral("permissions"), !fileInfo.permissions.isNull() ? QString(fileInfo.permissions.toString()) : fileInfo.isShared ? QStringLiteral("GSRDNVCKW") : QStringLiteral("GRDNVCKW"));
xml.writeTextElement(ocUri, QStringLiteral("share-permissions"), QString::number(static_cast<int>(OCC::SharePermissions(OCC::SharePermissionRead |
OCC::SharePermissionUpdate |
OCC::SharePermissionCreate |
diff -Nru nextcloud-desktop-3.16.4/test/syncenginetestutils.h nextcloud-desktop-3.16.6/test/syncenginetestutils.h
--- nextcloud-desktop-3.16.4/test/syncenginetestutils.h 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/test/syncenginetestutils.h 2025-06-18 22:57:35.000000000 +0200
@@ -575,7 +575,7 @@
[[nodiscard]] OCC::SyncJournalDb &syncJournal() const { return *_journalDb; }
[[nodiscard]] FakeQNAM* networkAccessManager() const { return _fakeQnam; }
- FileModifier &localModifier() { return _localModifier; }
+ DiskFileModifier &localModifier() { return _localModifier; }
FileInfo &remoteModifier() { return _fakeQnam->currentRemoteState(); }
FileInfo currentLocalState();
diff -Nru nextcloud-desktop-3.16.4/test/testallfilesdeleted.cpp nextcloud-desktop-3.16.6/test/testallfilesdeleted.cpp
--- nextcloud-desktop-3.16.4/test/testallfilesdeleted.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/test/testallfilesdeleted.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -76,7 +76,7 @@
fakeFolder.syncEngine().journal()->clearFileTable(); // That's what Folder is doing
});
- auto &modifier = deleteOnRemote ? fakeFolder.remoteModifier() : fakeFolder.localModifier();
+ auto &modifier = deleteOnRemote ? fakeFolder.remoteModifier() : static_cast<FileModifier&>(fakeFolder.localModifier());
const auto childrenKeys = fakeFolder.currentRemoteState().children.keys();
for (const auto &key : childrenKeys) {
modifier.remove(key);
@@ -118,7 +118,7 @@
callback(false);
});
- auto &modifier = deleteOnRemote ? fakeFolder.remoteModifier() : fakeFolder.localModifier();
+ auto &modifier = deleteOnRemote ? fakeFolder.remoteModifier() : static_cast<FileModifier&>(fakeFolder.localModifier());
const auto childrenKeys = fakeFolder.currentRemoteState().children.keys();
for (const auto &key : childrenKeys) {
modifier.remove(key);
diff -Nru nextcloud-desktop-3.16.4/test/testblacklist.cpp nextcloud-desktop-3.16.6/test/testblacklist.cpp
--- nextcloud-desktop-3.16.4/test/testblacklist.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/test/testblacklist.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -46,7 +46,7 @@
QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
ItemCompletedSpy completeSpy(fakeFolder);
- auto &modifier = remote ? fakeFolder.remoteModifier() : fakeFolder.localModifier();
+ auto &modifier = remote ? fakeFolder.remoteModifier() : static_cast<FileModifier&>(fakeFolder.localModifier());
int counter = 0;
const QByteArray testFileName = QByteArrayLiteral("A/new");
diff -Nru nextcloud-desktop-3.16.4/test/testfilesystem.cpp nextcloud-desktop-3.16.6/test/testfilesystem.cpp
--- nextcloud-desktop-3.16.4/test/testfilesystem.cpp 1970-01-01 01:00:00.000000000 +0100
+++ nextcloud-desktop-3.16.6/test/testfilesystem.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -0,0 +1,133 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: CC0-1.0
+ *
+ * This software is in the public domain, furnished "as is", without technical
+ * support, and with no warranty, express or implied, as to its usefulness for
+ * any purpose.
+ */
+
+#include <QtTest>
+#include <QTemporaryDir>
+
+#include "common/filesystembase.h"
+#include "logger.h"
+
+#include "libsync/filesystem.h"
+
+using namespace OCC;
+namespace std_fs = std::filesystem;
+
+class TestFileSystem : public QObject
+{
+ Q_OBJECT
+
+private:
+ QTemporaryDir testDir;
+
+private Q_SLOTS:
+ void initTestCase()
+ {
+ OCC::Logger::instance()->setLogFlush(true);
+ OCC::Logger::instance()->setLogDebug(true);
+
+ QStandardPaths::setTestModeEnabled(true);
+
+ QDir dir(testDir.path());
+ dir.mkdir("existingDirectory");
+ }
+
+#ifndef Q_OS_WIN
+ void testSetFolderPermissionsExistingDirectory_data()
+ {
+ constexpr auto perms_0555 =
+ std_fs::perms::owner_read | std_fs::perms::owner_exec
+ | std_fs::perms::group_read | std_fs::perms::group_exec
+ | std_fs::perms::others_read | std_fs::perms::others_exec;
+ constexpr auto perms_0755 = perms_0555 | std_fs::perms::owner_write;
+ constexpr auto perms_0775 = perms_0755 | std_fs::perms::group_write;
+
+ QTest::addColumn<std_fs::perms>("originalPermissions");
+ QTest::addColumn<FileSystem::FolderPermissions>("folderPermissions");
+ QTest::addColumn<bool>("expectedResult");
+ QTest::addColumn<bool>("expectedPermissionsChanged");
+ QTest::addColumn<std_fs::perms>("expectedPermissions");
+
+ QTest::newRow("0777, readonly -> 0555, changed")
+ << std_fs::perms::all
+ << FileSystem::FolderPermissions::ReadOnly
+ << true
+ << true
+ << perms_0555;
+
+ QTest::newRow("0555, readonly -> 0555, not changed")
+ << perms_0555
+ << FileSystem::FolderPermissions::ReadOnly
+ << true
+ << false
+ << perms_0555;
+
+ QTest::newRow("0777, readwrite -> 0775, changed")
+ << std_fs::perms::all
+ << FileSystem::FolderPermissions::ReadWrite
+ << true
+ << true
+ << perms_0775;
+
+ QTest::newRow("0775, readwrite -> 0775, not changed")
+ << perms_0775
+ << FileSystem::FolderPermissions::ReadWrite
+ << true
+ << false
+ << perms_0775;
+
+ QTest::newRow("0755, readwrite -> 0755, not changed")
+ << perms_0755
+ << FileSystem::FolderPermissions::ReadWrite
+ << true
+ << false
+ << perms_0755;
+
+ QTest::newRow("0555, readwrite -> 0755, changed")
+ << perms_0555
+ << FileSystem::FolderPermissions::ReadWrite
+ << true
+ << true
+ << perms_0755;
+ }
+
+ void testSetFolderPermissionsExistingDirectory()
+ {
+ QFETCH(std_fs::perms, originalPermissions);
+ QFETCH(FileSystem::FolderPermissions, folderPermissions);
+ QFETCH(bool, expectedResult);
+ QFETCH(bool, expectedPermissionsChanged);
+ QFETCH(std_fs::perms, expectedPermissions);
+
+ bool permissionsDidChange = false;
+ QString fullPath = testDir.filePath("existingDirectory");
+ const auto stdStrPath = fullPath.toStdWString();
+
+ std_fs::permissions(stdStrPath, originalPermissions);
+
+ QCOMPARE(FileSystem::setFolderPermissions(fullPath, folderPermissions, &permissionsDidChange), expectedResult);
+
+ const auto newPermissions = std_fs::status(stdStrPath).permissions();
+ QCOMPARE(newPermissions, expectedPermissions);
+ QCOMPARE(permissionsDidChange, expectedPermissionsChanged);
+ }
+
+ void testSetFolderPermissionsNonexistentDirectory()
+ {
+ bool permissionsDidChange = false;
+
+ QString fullPath = testDir.filePath("nonexistentDirectory");
+
+ QCOMPARE(FileSystem::setFolderPermissions("nonexistentDirectory", FileSystem::FolderPermissions::ReadOnly, &permissionsDidChange), false);
+ QCOMPARE(permissionsDidChange, false);
+ }
+#endif
+};
+
+QTEST_GUILESS_MAIN(TestFileSystem)
+#include "testfilesystem.moc"
diff -Nru nextcloud-desktop-3.16.4/test/testfolderman.cpp nextcloud-desktop-3.16.6/test/testfolderman.cpp
--- nextcloud-desktop-3.16.4/test/testfolderman.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/test/testfolderman.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -178,6 +178,7 @@
fakeFolder.remoteModifier().insert(firstSharePath, 100);
const auto firstShare = fakeFolder.remoteModifier().find(firstSharePath);
QVERIFY(firstShare);
+ firstShare->permissions.setPermission(OCC::RemotePermissions::CanRead);
firstShare->permissions.setPermission(OCC::RemotePermissions::IsShared);
fakeFolder.remoteModifier().mkdir("A/B");
@@ -185,6 +186,7 @@
fakeFolder.remoteModifier().insert(secondSharePath, 100);
const auto secondShare = fakeFolder.remoteModifier().find(secondSharePath);
QVERIFY(secondShare);
+ secondShare->permissions.setPermission(OCC::RemotePermissions::CanRead);
secondShare->permissions.setPermission(OCC::RemotePermissions::IsShared);
FolderMan *folderman = FolderMan::instance();
diff -Nru nextcloud-desktop-3.16.4/test/testlockfile.cpp nextcloud-desktop-3.16.6/test/testlockfile.cpp
--- nextcloud-desktop-3.16.4/test/testlockfile.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/test/testlockfile.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -789,6 +789,83 @@
QCOMPARE(lockFileDetectedNewlyUploadedSpy.count(), 1);
}
+
+ void testLockFile_verifyE2eeFilesUseCorrectPath()
+ {
+ const auto e2eeRoot = QStringLiteral("encrypted");
+ const auto cleartextFilePath = QStringLiteral("encrypted/document.odt");
+ const auto encryptedFilePath = QStringLiteral("encrypted/1e4c70c057994f9daf7bbab71b046d5b");
+
+ FakeFolder fakeFolder{FileInfo{}};
+
+ fakeFolder.localModifier().mkdir(e2eeRoot);
+ fakeFolder.remoteModifier().mkdir(e2eeRoot);
+ fakeFolder.localModifier().insert(cleartextFilePath);
+
+ QVERIFY(fakeFolder.syncOnce());
+
+ // modify local entry for the file to be locked to pretend it's E2E encrypted
+ OCC::SyncJournalFileRecord record;
+ QVERIFY(fakeFolder.syncJournal().getFileRecord(cleartextFilePath, &record));
+ record._e2eEncryptionStatus = OCC::SyncJournalFileRecord::EncryptionStatus::EncryptedMigratedV2_0;
+ record._e2eMangledName = encryptedFilePath.toUtf8();
+ record._path = cleartextFilePath.toUtf8();
+ QVERIFY(fakeFolder.syncJournal().setFileRecord(record));
+
+ // do something similar on the remote -- the encrypted file has a different name
+ fakeFolder.remoteModifier().rename(cleartextFilePath, encryptedFilePath);
+ fakeFolder.remoteModifier().setE2EE(encryptedFilePath, true);
+
+ // another sync run should not fail now, even with our pretended E2Ee setup :-)
+ QVERIFY(fakeFolder.syncOnce());
+
+ auto job = new OCC::LockFileJob(fakeFolder.account(),
+ &fakeFolder.syncJournal(),
+ QStringLiteral("/") + cleartextFilePath,
+ QStringLiteral("/"),
+ fakeFolder.localPath(),
+ {},
+ OCC::SyncFileItem::LockStatus::LockedItem,
+ OCC::SyncFileItem::LockOwnerType::UserLock);
+
+ QSignalSpy jobSuccess(job, &OCC::LockFileJob::finishedWithoutError);
+ QSignalSpy jobFailure(job, &OCC::LockFileJob::finishedWithError);
+
+ QString lockRequestPath;
+ connect(fakeFolder.networkAccessManager(), &QNetworkAccessManager::finished, [&lockRequestPath](QNetworkReply *reply) {
+ const auto request = reply->request();
+ if (request.attribute(QNetworkRequest::CustomVerbAttribute).toString() != QStringLiteral("LOCK")) {
+ return;
+ }
+
+ QVERIFY(lockRequestPath.isEmpty());
+ lockRequestPath = request.url().path();
+ });
+
+ job->start();
+
+ QVERIFY(jobSuccess.wait());
+ QCOMPARE(jobFailure.count(), 0);
+
+ // expect the path of the LOCK request to have used the mangled name
+ QVERIFY(!lockRequestPath.isEmpty());
+ QVERIFY(lockRequestPath.contains(encryptedFilePath));
+ QVERIFY(!lockRequestPath.contains(cleartextFilePath));
+
+ auto fileRecord = OCC::SyncJournalFileRecord{};
+ QVERIFY(fakeFolder.syncJournal().getFileRecord(cleartextFilePath, &fileRecord));
+ QVERIFY(fileRecord.isE2eEncrypted());
+ QCOMPARE(fileRecord.e2eMangledName(), encryptedFilePath);
+ QCOMPARE(fileRecord._lockstate._locked, true);
+ QCOMPARE(fileRecord._lockstate._lockEditorApp, QString{});
+ QCOMPARE(fileRecord._lockstate._lockOwnerDisplayName, QStringLiteral("John Doe"));
+ QCOMPARE(fileRecord._lockstate._lockOwnerId, QStringLiteral("admin"));
+ QCOMPARE(fileRecord._lockstate._lockOwnerType, static_cast<qint64>(OCC::SyncFileItem::LockOwnerType::UserLock));
+ QCOMPARE(fileRecord._lockstate._lockTime, 1234560);
+ QCOMPARE(fileRecord._lockstate._lockTimeout, 1800);
+
+ QVERIFY(fakeFolder.syncOnce());
+ }
};
QTEST_GUILESS_MAIN(TestLockFile)
diff -Nru nextcloud-desktop-3.16.4/test/testpermissions.cpp nextcloud-desktop-3.16.6/test/testpermissions.cpp
--- nextcloud-desktop-3.16.4/test/testpermissions.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/test/testpermissions.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -94,9 +94,23 @@
QStandardPaths::setTestModeEnabled(true);
}
+ void t7pl_data()
+ {
+ QTest::addColumn<bool>("moveToTrashEnabled");
+ QTest::newRow("move to trash") << true;
+ QTest::newRow("delete") << false;
+ }
+
void t7pl()
{
+ QFETCH(bool, moveToTrashEnabled);
+
FakeFolder fakeFolder{ FileInfo() };
+
+ auto syncOptions = fakeFolder.syncEngine().syncOptions();
+ syncOptions._moveFilesToTrash = moveToTrashEnabled;
+ fakeFolder.syncEngine().setSyncOptions(syncOptions);
+
QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
// Some of this test depends on the order of discovery. With threading
@@ -111,11 +125,11 @@
//create some files
auto insertIn = [&](const QString &dir) {
- fakeFolder.remoteModifier().insert(dir + "normalFile_PERM_WVND_.data", 100 );
- fakeFolder.remoteModifier().insert(dir + "cannotBeRemoved_PERM_WVN_.data", 101 );
- fakeFolder.remoteModifier().insert(dir + "canBeRemoved_PERM_D_.data", 102 );
- fakeFolder.remoteModifier().insert(dir + "cannotBeModified_PERM_DVN_.data", cannotBeModifiedSize , 'A');
- fakeFolder.remoteModifier().insert(dir + "canBeModified_PERM_W_.data", canBeModifiedSize );
+ fakeFolder.remoteModifier().insert(dir + "normalFile_PERM_GWVND_.data", 100 );
+ fakeFolder.remoteModifier().insert(dir + "cannotBeRemoved_PERM_GWVN_.data", 101 );
+ fakeFolder.remoteModifier().insert(dir + "canBeRemoved_PERM_GD_.data", 102 );
+ fakeFolder.remoteModifier().insert(dir + "cannotBeModified_PERM_GDVN_.data", cannotBeModifiedSize , 'A');
+ fakeFolder.remoteModifier().insert(dir + "canBeModified_PERM_GW_.data", canBeModifiedSize );
};
//put them in some directories
@@ -125,7 +139,7 @@
insertIn("readonlyDirectory_PERM_M_/" );
fakeFolder.remoteModifier().mkdir("readonlyDirectory_PERM_M_/subdir_PERM_CK_");
fakeFolder.remoteModifier().mkdir("readonlyDirectory_PERM_M_/subdir_PERM_CK_/subsubdir_PERM_CKDNV_");
- fakeFolder.remoteModifier().insert("readonlyDirectory_PERM_M_/subdir_PERM_CK_/subsubdir_PERM_CKDNV_/normalFile_PERM_WVND_.data", 100);
+ fakeFolder.remoteModifier().insert("readonlyDirectory_PERM_M_/subdir_PERM_CK_/subsubdir_PERM_CKDNV_/normalFile_PERM_GWVND_.data", 100);
applyPermissionsFromName(fakeFolder.remoteModifier());
QVERIFY(fakeFolder.syncOnce());
@@ -196,13 +210,13 @@
//1. remove the file than cannot be removed
// (they should be recovered)
- fakeFolder.localModifier().remove("normalDirectory_PERM_CKDNV_/cannotBeRemoved_PERM_WVN_.data");
- removeReadOnly("readonlyDirectory_PERM_M_/cannotBeRemoved_PERM_WVN_.data");
+ fakeFolder.localModifier().remove("normalDirectory_PERM_CKDNV_/cannotBeRemoved_PERM_GWVN_.data");
+ removeReadOnly("readonlyDirectory_PERM_M_/cannotBeRemoved_PERM_GWVN_.data");
//2. remove the file that can be removed
// (they should properly be gone)
- removeReadOnly("normalDirectory_PERM_CKDNV_/canBeRemoved_PERM_D_.data");
- removeReadOnly("readonlyDirectory_PERM_M_/canBeRemoved_PERM_D_.data");
+ removeReadOnly("normalDirectory_PERM_CKDNV_/canBeRemoved_PERM_GD_.data");
+ removeReadOnly("readonlyDirectory_PERM_M_/canBeRemoved_PERM_GD_.data");
//3. Edit the files that cannot be modified
// (they should be recovered, and a conflict shall be created)
@@ -211,17 +225,19 @@
QFile(fakeFolder.localPath() + file).setPermissions(QFile::WriteOwner | QFile::ReadOwner);
fakeFolder.localModifier().appendByte(file);
};
- editReadOnly("normalDirectory_PERM_CKDNV_/cannotBeModified_PERM_DVN_.data");
- editReadOnly("readonlyDirectory_PERM_M_/cannotBeModified_PERM_DVN_.data");
+ editReadOnly("normalDirectory_PERM_CKDNV_/cannotBeModified_PERM_GDVN_.data");
+#if !defined Q_OS_WINDOWS
+ editReadOnly("readonlyDirectory_PERM_M_/cannotBeModified_PERM_GDVN_.data");
+#endif
//4. Edit other files
// (they should be uploaded)
- fakeFolder.localModifier().appendByte("normalDirectory_PERM_CKDNV_/canBeModified_PERM_W_.data");
- fakeFolder.localModifier().appendByte("readonlyDirectory_PERM_M_/canBeModified_PERM_W_.data");
+ fakeFolder.localModifier().appendByte("normalDirectory_PERM_CKDNV_/canBeModified_PERM_GW_.data");
+ fakeFolder.localModifier().appendByte("readonlyDirectory_PERM_M_/canBeModified_PERM_GW_.data");
//5. Create a new file in a read write folder
// (should be uploaded)
- fakeFolder.localModifier().insert("normalDirectory_PERM_CKDNV_/newFile_PERM_WDNV_.data", 106 );
+ fakeFolder.localModifier().insert("normalDirectory_PERM_CKDNV_/newFile_PERM_GWDNV_.data", 106 );
applyPermissionsFromName(fakeFolder.remoteModifier());
//do the sync
@@ -231,36 +247,42 @@
//1.
// File should be recovered
- QVERIFY(currentLocalState.find("normalDirectory_PERM_CKDNV_/cannotBeRemoved_PERM_WVN_.data"));
- QVERIFY(currentLocalState.find("readonlyDirectory_PERM_M_/cannotBeRemoved_PERM_WVN_.data"));
+ QVERIFY(currentLocalState.find("normalDirectory_PERM_CKDNV_/cannotBeRemoved_PERM_GWVN_.data"));
+#if !defined Q_OS_WINDOWS
+ QCOMPARE(currentLocalState.find("readonlyDirectory_PERM_M_/cannotBeModified_PERM_GDVN_.data")->size, cannotBeModifiedSize);
+#endif
+ QVERIFY(currentLocalState.find("readonlyDirectory_PERM_M_/cannotBeRemoved_PERM_GWVN_.data"));
//2.
// File should be deleted
- QVERIFY(!currentLocalState.find("normalDirectory_PERM_CKDNV_/canBeRemoved_PERM_D_.data"));
- QVERIFY(!currentLocalState.find("readonlyDirectory_PERM_M_/canBeRemoved_PERM_D_.data"));
+ QVERIFY(!currentLocalState.find("normalDirectory_PERM_CKDNV_/canBeRemoved_PERM_GD_.data"));
+ QVERIFY(!currentLocalState.find("readonlyDirectory_PERM_M_/canBeRemoved_PERM_GD_.data"));
//3.
// File should be recovered
- QCOMPARE(currentLocalState.find("normalDirectory_PERM_CKDNV_/cannotBeModified_PERM_DVN_.data")->size, cannotBeModifiedSize);
- QCOMPARE(currentLocalState.find("readonlyDirectory_PERM_M_/cannotBeModified_PERM_DVN_.data")->size, cannotBeModifiedSize);
+ QCOMPARE(currentLocalState.find("normalDirectory_PERM_CKDNV_/cannotBeModified_PERM_GDVN_.data")->size, cannotBeModifiedSize);
// and conflict created
- auto c1 = findConflict(currentLocalState, "normalDirectory_PERM_CKDNV_/cannotBeModified_PERM_DVN_.data");
+ auto c1 = findConflict(currentLocalState, "normalDirectory_PERM_CKDNV_/cannotBeModified_PERM_GDVN_.data");
QVERIFY(c1);
QCOMPARE(c1->size, cannotBeModifiedSize + 1);
- auto c2 = findConflict(currentLocalState, "readonlyDirectory_PERM_M_/cannotBeModified_PERM_DVN_.data");
+#if !defined Q_OS_WINDOWS
+ auto c2 = findConflict(currentLocalState, "readonlyDirectory_PERM_M_/cannotBeModified_PERM_GDVN_.data");
QVERIFY(c2);
QCOMPARE(c2->size, cannotBeModifiedSize + 1);
+#endif
// remove the conflicts for the next state comparison
fakeFolder.localModifier().remove(c1->path());
+#if !defined Q_OS_WINDOWS
removeReadOnly(c2->path());
+#endif
//4. File should be updated, that's tested by assertLocalAndRemoteDir
- QCOMPARE(currentLocalState.find("normalDirectory_PERM_CKDNV_/canBeModified_PERM_W_.data")->size, canBeModifiedSize + 1);
- QCOMPARE(currentLocalState.find("readonlyDirectory_PERM_M_/canBeModified_PERM_W_.data")->size, canBeModifiedSize + 1);
+ QCOMPARE(currentLocalState.find("normalDirectory_PERM_CKDNV_/canBeModified_PERM_GW_.data")->size, canBeModifiedSize + 1);
+ QCOMPARE(currentLocalState.find("readonlyDirectory_PERM_M_/canBeModified_PERM_GW_.data")->size, canBeModifiedSize + 1);
//5.
// the file should be in the server and local
- QVERIFY(currentLocalState.find("normalDirectory_PERM_CKDNV_/newFile_PERM_WDNV_.data"));
+ QVERIFY(currentLocalState.find("normalDirectory_PERM_CKDNV_/newFile_PERM_GWDNV_.data"));
// Both side should still be the same
QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
@@ -269,7 +291,7 @@
//6. Create a new file in a read only folder
// (they should not be uploaded)
- insertReadOnly("readonlyDirectory_PERM_M_/newFile_PERM_WDNV_.data", 105 );
+ insertReadOnly("readonlyDirectory_PERM_M_/newFile_PERM_GWDNV_.data", 105 );
applyPermissionsFromName(fakeFolder.remoteModifier());
// error: can't upload to readonly
@@ -280,8 +302,8 @@
//6.
// The file should not exist on the remote, and not be there
- QVERIFY(!currentLocalState.find("readonlyDirectory_PERM_M_/newFile_PERM_WDNV_.data"));
- QVERIFY(!fakeFolder.currentRemoteState().find("readonlyDirectory_PERM_M_/newFile_PERM_WDNV_.data"));
+ QVERIFY(!currentLocalState.find("readonlyDirectory_PERM_M_/newFile_PERM_GWDNV_.data"));
+ QVERIFY(!fakeFolder.currentRemoteState().find("readonlyDirectory_PERM_M_/newFile_PERM_GWDNV_.data"));
// Both side should still be the same
QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
@@ -294,7 +316,7 @@
QVERIFY(fakeFolder.syncOnce());
assertCsyncJournalOk(fakeFolder.syncJournal());
currentLocalState = fakeFolder.currentLocalState();
- QVERIFY(currentLocalState.find("readonlyDirectory_PERM_M_/cannotBeRemoved_PERM_WVN_.data"));
+ QVERIFY(currentLocalState.find("readonlyDirectory_PERM_M_/cannotBeRemoved_PERM_GWVN_.data"));
QVERIFY(currentLocalState.find("readonlyDirectory_PERM_M_/subdir_PERM_CK_"));
// the subdirectory had delete permissions, but, it was within the recovered directory, so must also get recovered
QVERIFY(currentLocalState.find("readonlyDirectory_PERM_M_/subdir_PERM_CK_/subsubdir_PERM_CKDNV_"));
@@ -319,16 +341,16 @@
QVERIFY(currentLocalState.find("readonlyDirectory_PERM_M_/subdir_PERM_CK_"));
// contents moved (had move permissions)
QVERIFY(!currentLocalState.find("readonlyDirectory_PERM_M_/subdir_PERM_CK_/subsubdir_PERM_CKDNV_"));
- QVERIFY(!currentLocalState.find("readonlyDirectory_PERM_M_/subdir_PERM_CK_/subsubdir_PERM_CKDNV_/normalFile_PERM_WVND_.data"));
+ QVERIFY(!currentLocalState.find("readonlyDirectory_PERM_M_/subdir_PERM_CK_/subsubdir_PERM_CKDNV_/normalFile_PERM_GWVND_.data"));
// new still exist (and is uploaded)
- QVERIFY(currentLocalState.find("normalDirectory_PERM_CKDNV_/subdir_PERM_CKDNV_/subsubdir_PERM_CKDNV_/normalFile_PERM_WVND_.data"));
+ QVERIFY(currentLocalState.find("normalDirectory_PERM_CKDNV_/subdir_PERM_CKDNV_/subsubdir_PERM_CKDNV_/normalFile_PERM_GWVND_.data"));
QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
// restore for further tests
fakeFolder.remoteModifier().mkdir("readonlyDirectory_PERM_M_/subdir_PERM_CK_/subsubdir_PERM_CKDNV_");
- fakeFolder.remoteModifier().insert("readonlyDirectory_PERM_M_/subdir_PERM_CK_/subsubdir_PERM_CKDNV_/normalFile_PERM_WVND_.data");
+ fakeFolder.remoteModifier().insert("readonlyDirectory_PERM_M_/subdir_PERM_CK_/subsubdir_PERM_CKDNV_/normalFile_PERM_GWVND_.data");
applyPermissionsFromName(fakeFolder.remoteModifier());
QVERIFY(fakeFolder.syncOnce());
QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
@@ -342,7 +364,7 @@
QVERIFY(fakeFolder.syncOnce());
assertCsyncJournalOk(fakeFolder.syncJournal());
- QVERIFY(fakeFolder.currentLocalState().find("readonlyDirectory_PERM_M_/subdir_PERM_CK_/subsubdir_PERM_CKDNV_/normalFile_PERM_WVND_.data" ));
+ QVERIFY(fakeFolder.currentLocalState().find("readonlyDirectory_PERM_M_/subdir_PERM_CK_/subsubdir_PERM_CKDNV_/normalFile_PERM_GWVND_.data" ));
//1. rename a directory in a read only folder
//Missing directory should be restored
@@ -360,9 +382,9 @@
// old name restored
QVERIFY(currentLocalState.find("readonlyDirectory_PERM_M_/subdir_PERM_CK_" ));
// including contents
- QVERIFY(currentLocalState.find("readonlyDirectory_PERM_M_/subdir_PERM_CK_/subsubdir_PERM_CKDNV_/normalFile_PERM_WVND_.data" ));
+ QVERIFY(currentLocalState.find("readonlyDirectory_PERM_M_/subdir_PERM_CK_/subsubdir_PERM_CKDNV_/normalFile_PERM_GWVND_.data" ));
// new no longer exists
- QVERIFY(!currentLocalState.find("readonlyDirectory_PERM_M_/newname_PERM_CK_/subsubdir_PERM_CKDNV_/normalFile_PERM_WVND_.data" ));
+ QVERIFY(!currentLocalState.find("readonlyDirectory_PERM_M_/newname_PERM_CK_/subsubdir_PERM_CKDNV_/normalFile_PERM_GWVND_.data" ));
// but is not on server: should have been locally removed
QVERIFY(!currentLocalState.find("readonlyDirectory_PERM_M_/newname_PERM_CK_"));
@@ -372,7 +394,7 @@
// but still on the server: the rename causing an error meant the deletes didn't execute
QVERIFY(fakeFolder.currentRemoteState().find("normalDirectory_PERM_CKDNV_/subdir_PERM_CKDNV_"));
// new no longer exists
- QVERIFY(!currentLocalState.find("readonlyDirectory_PERM_M_/moved_PERM_CK_/subsubdir_PERM_CKDNV_/normalFile_PERM_WVND_.data" ));
+ QVERIFY(!currentLocalState.find("readonlyDirectory_PERM_M_/moved_PERM_CK_/subsubdir_PERM_CKDNV_/normalFile_PERM_GWVND_.data" ));
// should have been cleaned up as invalid item inside read-only folder
QVERIFY(!currentLocalState.find("readonlyDirectory_PERM_M_/moved_PERM_CK_"));
fakeFolder.remoteModifier().remove("normalDirectory_PERM_CKDNV_/subdir_PERM_CKDNV_");
@@ -383,20 +405,20 @@
//######################################################################
qInfo( "multiple restores of a file create different conflict files" );
- fakeFolder.remoteModifier().insert("readonlyDirectory_PERM_M_/cannotBeModified_PERM_DVN_.data");
+ fakeFolder.remoteModifier().insert("readonlyDirectory_PERM_M_/cannotBeModified_PERM_GDVN_.data");
applyPermissionsFromName(fakeFolder.remoteModifier());
QVERIFY(fakeFolder.syncOnce());
- editReadOnly("readonlyDirectory_PERM_M_/cannotBeModified_PERM_DVN_.data");
- fakeFolder.localModifier().setContents("readonlyDirectory_PERM_M_/cannotBeModified_PERM_DVN_.data", 's');
+ editReadOnly("readonlyDirectory_PERM_M_/cannotBeModified_PERM_GDVN_.data");
+ fakeFolder.localModifier().setContents("readonlyDirectory_PERM_M_/cannotBeModified_PERM_GDVN_.data", 's');
//do the sync
applyPermissionsFromName(fakeFolder.remoteModifier());
QVERIFY(fakeFolder.syncOnce());
assertCsyncJournalOk(fakeFolder.syncJournal());
QThread::sleep(1); // make sure changes have different mtime
- editReadOnly("readonlyDirectory_PERM_M_/cannotBeModified_PERM_DVN_.data");
- fakeFolder.localModifier().setContents("readonlyDirectory_PERM_M_/cannotBeModified_PERM_DVN_.data", 'd');
+ editReadOnly("readonlyDirectory_PERM_M_/cannotBeModified_PERM_GDVN_.data");
+ fakeFolder.localModifier().setContents("readonlyDirectory_PERM_M_/cannotBeModified_PERM_GDVN_.data", 'd');
//do the sync
applyPermissionsFromName(fakeFolder.remoteModifier());
@@ -406,7 +428,7 @@
// there should be two conflict files
currentLocalState = fakeFolder.currentLocalState();
int count = 0;
- while (auto i = findConflict(currentLocalState, "readonlyDirectory_PERM_M_/cannotBeModified_PERM_DVN_.data")) {
+ while (auto i = findConflict(currentLocalState, "readonlyDirectory_PERM_M_/cannotBeModified_PERM_GDVN_.data")) {
QVERIFY((i->contentChar == 's') || (i->contentChar == 'd'));
removeReadOnly(i->path());
currentLocalState = fakeFolder.currentLocalState();
@@ -461,10 +483,10 @@
rm.insert("zallowed/sub/file");
rm.insert("zallowed/sub2/file");
- setAllPerm(rm.find("norename"), RemotePermissions::fromServerString("WDVCK"));
- setAllPerm(rm.find("nomove"), RemotePermissions::fromServerString("WDNCK"));
- setAllPerm(rm.find("nocreatefile"), RemotePermissions::fromServerString("WDNVK"));
- setAllPerm(rm.find("nocreatedir"), RemotePermissions::fromServerString("WDNVC"));
+ setAllPerm(rm.find("norename"), RemotePermissions::fromServerString("GWDVCK"));
+ setAllPerm(rm.find("nomove"), RemotePermissions::fromServerString("GWDNCK"));
+ setAllPerm(rm.find("nocreatefile"), RemotePermissions::fromServerString("GWDNVK"));
+ setAllPerm(rm.find("nocreatedir"), RemotePermissions::fromServerString("GWDNVC"));
QVERIFY(fakeFolder.syncOnce());
@@ -689,7 +711,7 @@
remote.mkdir("testFolder/newSubFolder");
remote.create("testFolder/testFile", 12, '9');
remote.create("testFolder/testReadOnlyFile", 13, '8');
- remote.find("testFolder/testReadOnlyFile")->permissions = RemotePermissions::fromServerString("m");
+ remote.find("testFolder/testReadOnlyFile")->permissions = RemotePermissions::fromServerString("mG");
QVERIFY(fakeFolder.syncOnce());
QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
@@ -720,7 +742,7 @@
remote.find("readOnlyFolder")->permissions = RemotePermissions::fromServerString("M");
remote.find("readOnlyFolder/test")->permissions = RemotePermissions::fromServerString("m");
- remote.find("readOnlyFolder/readOnlyFile.txt")->permissions = RemotePermissions::fromServerString("m");
+ remote.find("readOnlyFolder/readOnlyFile.txt")->permissions = RemotePermissions::fromServerString("mG");
QVERIFY(fakeFolder.syncOnce());
QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
@@ -750,7 +772,7 @@
remote.find("readOnlyFolder")->permissions = RemotePermissions::fromServerString("M");
remote.find("readOnlyFolder/test")->permissions = RemotePermissions::fromServerString("m");
- remote.find("readOnlyFolder/readOnlyFile.txt")->permissions = RemotePermissions::fromServerString("m");
+ remote.find("readOnlyFolder/readOnlyFile.txt")->permissions = RemotePermissions::fromServerString("mG");
QVERIFY(fakeFolder.syncOnce());
QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
@@ -784,7 +806,7 @@
remote.find("readOnlyFolder")->permissions = RemotePermissions::fromServerString("M");
remote.find("readOnlyFolder/child")->permissions = RemotePermissions::fromServerString("m");
remote.find("readOnlyFolder/test")->permissions = RemotePermissions::fromServerString("m");
- remote.find("readOnlyFolder/readOnlyFile.txt")->permissions = RemotePermissions::fromServerString("m");
+ remote.find("readOnlyFolder/readOnlyFile.txt")->permissions = RemotePermissions::fromServerString("mG");
QVERIFY(fakeFolder.syncOnce());
QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
@@ -817,13 +839,13 @@
remote.find("readOnlyFolder")->permissions = RemotePermissions::fromServerString("M");
remote.find("readOnlyFolder/test")->permissions = RemotePermissions::fromServerString("m");
- remote.find("readOnlyFolder/readOnlyFile.txt")->permissions = RemotePermissions::fromServerString("m");
+ remote.find("readOnlyFolder/readOnlyFile.txt")->permissions = RemotePermissions::fromServerString("mG");
QVERIFY(fakeFolder.syncOnce());
QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
remote.insert("readOnlyFolder/test/newFile.txt");
- remote.find("readOnlyFolder/test/newFile.txt")->permissions = RemotePermissions::fromServerString("m");
+ remote.find("readOnlyFolder/test/newFile.txt")->permissions = RemotePermissions::fromServerString("mG");
remote.mkdir("readOnlyFolder/test/newFolder");
remote.find("readOnlyFolder/test/newFolder")->permissions = RemotePermissions::fromServerString("m");
remote.appendByte("readOnlyFolder/readOnlyFile.txt");
@@ -841,6 +863,69 @@
QVERIFY(ensureReadOnlyItem("/readOnlyFolder/test/newFile.txt"));
QVERIFY(ensureReadOnlyItem("/readOnlyFolder/newFolder"));
}
+
+ void testForbiddenDownload()
+ {
+ FakeFolder fakeFolder{FileInfo{}};
+ QObject parent;
+
+ fakeFolder.setServerOverride([&](QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData) -> QNetworkReply * {
+ Q_UNUSED(outgoingData)
+
+ if (op == QNetworkAccessManager::GetOperation) {
+ return new FakeErrorReply(op, request, &parent, 403, "Access to this shared resource has been denied because its download permission is disabled.");
+ }
+
+ return nullptr;
+ });
+
+ fakeFolder.remoteModifier().insert("file");
+
+ setAllPerm(fakeFolder.remoteModifier().find("file"), RemotePermissions::fromServerString("DNVRS"));
+
+ // also hook into discovery!!
+ SyncFileItemVector discovery;
+ connect(&fakeFolder.syncEngine(), &SyncEngine::aboutToPropagate, this, [&discovery](auto v) { discovery = v; });
+ ItemCompletedSpy completeSpy(fakeFolder);
+ QVERIFY(fakeFolder.syncOnce());
+
+ QVERIFY(itemInstruction(completeSpy, "file", CSYNC_INSTRUCTION_IGNORE));
+ QVERIFY(discoveryInstruction(discovery, "file", CSYNC_INSTRUCTION_IGNORE));
+ }
+
+ void testExistingFileBecomeForbiddenDownload()
+ {
+ FakeFolder fakeFolder{FileInfo{}};
+ QObject parent;
+
+ fakeFolder.remoteModifier().insert("file");
+ auto fileInfo = fakeFolder.remoteModifier().find("file");
+ Q_ASSERT(fileInfo);
+ fileInfo->isShared = true;
+
+ QVERIFY(fakeFolder.syncOnce());
+
+ fakeFolder.setServerOverride([&](QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData) -> QNetworkReply * {
+ Q_UNUSED(outgoingData)
+
+ if (op == QNetworkAccessManager::GetOperation) {
+ return new FakeErrorReply(op, request, &parent, 403, "Access to this shared resource has been denied because its download permission is disabled.");
+ }
+
+ return nullptr;
+ });
+
+ setAllPerm(fileInfo, RemotePermissions::fromServerString("DNVRS"));
+
+ // also hook into discovery!!
+ SyncFileItemVector discovery;
+ connect(&fakeFolder.syncEngine(), &SyncEngine::aboutToPropagate, this, [&discovery](auto v) { discovery = v; });
+ ItemCompletedSpy completeSpy(fakeFolder);
+ QVERIFY(fakeFolder.syncOnce());
+
+ QVERIFY(itemInstruction(completeSpy, "file", CSYNC_INSTRUCTION_REMOVE));
+ QVERIFY(discoveryInstruction(discovery, "file", CSYNC_INSTRUCTION_REMOVE));
+ }
};
QTEST_GUILESS_MAIN(TestPermissions)
diff -Nru nextcloud-desktop-3.16.4/test/testremotediscovery.cpp nextcloud-desktop-3.16.6/test/testremotediscovery.cpp
--- nextcloud-desktop-3.16.4/test/testremotediscovery.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/test/testremotediscovery.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -27,7 +27,7 @@
const QNetworkRequest &request, QObject *parent)
: FakePropfindReply(remoteRootFileInfo, op, request, parent) {
// If the propfind contains a single file without permissions, this is a server error
- const char toRemove[] = "<oc:permissions>RDNVCKW</oc:permissions>";
+ const char toRemove[] = "<oc:permissions>GRDNVCKW</oc:permissions>";
auto pos = payload.indexOf(toRemove, payload.size()/2);
QVERIFY(pos > 0);
payload.remove(pos, sizeof(toRemove) - 1);
diff -Nru nextcloud-desktop-3.16.4/test/testsyncengine.cpp nextcloud-desktop-3.16.6/test/testsyncengine.cpp
--- nextcloud-desktop-3.16.4/test/testsyncengine.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/test/testsyncengine.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -216,8 +216,23 @@
QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
}
+
+ void testLocalDelete_data()
+ {
+ QTest::addColumn<bool>("moveToTrashEnabled");
+ QTest::newRow("move to trash") << true;
+ QTest::newRow("delete") << false;
+ }
+
void testLocalDelete() {
+ QFETCH(bool, moveToTrashEnabled);
+
FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};
+
+ auto syncOptions = fakeFolder.syncEngine().syncOptions();
+ syncOptions._moveFilesToTrash = moveToTrashEnabled;
+ fakeFolder.syncEngine().setSyncOptions(syncOptions);
+
ItemCompletedSpy completeSpy(fakeFolder);
fakeFolder.remoteModifier().remove("A/a1");
fakeFolder.syncOnce();
@@ -234,10 +249,23 @@
QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
}
+ void testLocalDeleteWithReuploadForNewLocalFiles_data()
+ {
+ QTest::addColumn<bool>("moveToTrashEnabled");
+ QTest::newRow("move to trash") << true;
+ QTest::newRow("delete") << false;
+ }
+
void testLocalDeleteWithReuploadForNewLocalFiles()
{
+ QFETCH(bool, moveToTrashEnabled);
+
FakeFolder fakeFolder{FileInfo{}};
+ auto syncOptions = fakeFolder.syncEngine().syncOptions();
+ syncOptions._moveFilesToTrash = moveToTrashEnabled;
+ fakeFolder.syncEngine().setSyncOptions(syncOptions);
+
// create folders hierarchy with some nested dirs and files
fakeFolder.localModifier().mkdir("A");
fakeFolder.localModifier().insert("A/existingfile_A.txt", 100);
@@ -1563,9 +1591,23 @@
QCOMPARE(fileThirdSync->lastModified.toSecsSinceEpoch(), CURRENT_MTIME);
}
+ void testFolderRemovalWithCaseClash_data()
+ {
+ QTest::addColumn<bool>("moveToTrashEnabled");
+ QTest::newRow("move to trash") << true;
+ QTest::newRow("delete") << false;
+ }
+
void testFolderRemovalWithCaseClash()
{
- FakeFolder fakeFolder{ FileInfo{} };
+ QFETCH(bool, moveToTrashEnabled);
+
+ FakeFolder fakeFolder{FileInfo{}};
+
+ auto syncOptions = fakeFolder.syncEngine().syncOptions();
+ syncOptions._moveFilesToTrash = moveToTrashEnabled;
+ fakeFolder.syncEngine().setSyncOptions(syncOptions);
+
fakeFolder.remoteModifier().mkdir("A");
fakeFolder.remoteModifier().mkdir("toDelete");
fakeFolder.remoteModifier().insert("A/file");
@@ -1848,8 +1890,17 @@
}
}
+ void testServer_caseClash_createConflict_thenRemoveOneRemoteFile_data()
+ {
+ QTest::addColumn<bool>("moveToTrashEnabled");
+ QTest::newRow("move to trash") << true;
+ QTest::newRow("delete") << false;
+ }
+
void testServer_caseClash_createConflict_thenRemoveOneRemoteFile()
{
+ QFETCH(bool, moveToTrashEnabled);
+
constexpr auto testLowerCaseFile = "test";
constexpr auto testUpperCaseFile = "TEST";
@@ -1861,6 +1912,10 @@
FakeFolder fakeFolder{FileInfo{}};
+ auto syncOptions = fakeFolder.syncEngine().syncOptions();
+ syncOptions._moveFilesToTrash = moveToTrashEnabled;
+ fakeFolder.syncEngine().setSyncOptions(syncOptions);
+
fakeFolder.remoteModifier().insert("otherFile.txt");
fakeFolder.remoteModifier().insert(testLowerCaseFile);
fakeFolder.remoteModifier().insert(testUpperCaseFile);
@@ -2200,9 +2255,9 @@
fakeFolder.remoteModifier().insert("file3");
fakeFolder.remoteModifier().find("folder")->permissions = RemotePermissions::fromServerString("DNVS");
- fakeFolder.remoteModifier().find("folder/file1.lnk")->permissions = RemotePermissions::fromServerString("S");
- fakeFolder.remoteModifier().find("folder/file2.lnk")->permissions = RemotePermissions::fromServerString("S");
- fakeFolder.remoteModifier().find("folder/file3.lnk")->permissions = RemotePermissions::fromServerString("S");
+ fakeFolder.remoteModifier().find("folder/file1.lnk")->permissions = RemotePermissions::fromServerString("SG");
+ fakeFolder.remoteModifier().find("folder/file2.lnk")->permissions = RemotePermissions::fromServerString("SG");
+ fakeFolder.remoteModifier().find("folder/file3.lnk")->permissions = RemotePermissions::fromServerString("SG");
fakeFolder.remoteModifier().find("abcdefabcdefabcdefabcdefabcdefabcd")->permissions = RemotePermissions::fromServerString("DNVS");
fakeFolder.remoteModifier().find("abcdefabcdefabcdefabcdefabcdefabcd/abcdef abcdef abcdef a")->permissions = RemotePermissions::fromServerString("DNVS");
@@ -2212,7 +2267,7 @@
fakeFolder.remoteModifier().find("abcdefabcdefabcdefabcdefabcdefabcd/abcdef abcdef abcdef a/abcdef abcdef/abcdef acbdef abcd/123abcdefabcdef1/123123abcdef123 abcdef1")->permissions = RemotePermissions::fromServerString("DNVS");
fakeFolder.remoteModifier().find("abcdefabcdefabcdefabcdefabcdefabcd/abcdef abcdef abcdef a/abcdef abcdef/abcdef acbdef abcd/123abcdefabcdef1/123123abcdef123 abcdef1/12abcabc")->permissions = RemotePermissions::fromServerString("DNVS");
fakeFolder.remoteModifier().find("abcdefabcdefabcdefabcdefabcdefabcd/abcdef abcdef abcdef a/abcdef abcdef/abcdef acbdef abcd/123abcdefabcdef1/123123abcdef123 abcdef1/12abcabc/12abcabd")->permissions = RemotePermissions::fromServerString("DNVS");
- fakeFolder.remoteModifier().find("abcdefabcdefabcdefabcdefabcdefabcd/abcdef abcdef abcdef a/abcdef abcdef/abcdef acbdef abcd/123abcdefabcdef1/123123abcdef123 abcdef1/12abcabc/12abcabd/this is a long long long long long long long long long long long long long long long long l.docx - Sh.lnk")->permissions = RemotePermissions::fromServerString("S");
+ fakeFolder.remoteModifier().find("abcdefabcdefabcdefabcdefabcdefabcd/abcdef abcdef abcdef a/abcdef abcdef/abcdef acbdef abcd/123abcdefabcdef1/123123abcdef123 abcdef1/12abcabc/12abcabd/this is a long long long long long long long long long long long long long long long long l.docx - Sh.lnk")->permissions = RemotePermissions::fromServerString("SG");
QVERIFY(fakeFolder.syncOnce());
}
@@ -2290,6 +2345,78 @@
QCOMPARE(completeSpy.findItem(fileWithoutSpaces6)->_status, SyncFileItem::Status::Success);
QCOMPARE(completeSpy.findItem(extraFileNameWithoutSpaces)->_status, SyncFileItem::Status::Success);
}
+
+ void testTouchedFilesWhenChangingFolderPermissionsDuringSync()
+ {
+ FakeFolder fakeFolder{FileInfo{}};
+ fakeFolder.localModifier().mkdir("directory");
+ fakeFolder.localModifier().mkdir("directory/subdir");
+ fakeFolder.remoteModifier().mkdir("directory");
+ fakeFolder.remoteModifier().mkdir("directory/subdir");
+
+ // perform an initial sync to ensure local and remote have the same state
+ QVERIFY(fakeFolder.syncOnce());
+
+ QStringList touchedFiles;
+
+ // syncEngine->_propagator is only set during a sync, which doesn't work with QSignalSpy :(
+ connect(&fakeFolder.syncEngine(), &SyncEngine::started, this, [&]() {
+ // at this point we have a propagator to connect signals to
+ connect(fakeFolder.syncEngine().getPropagator().get(), &OwncloudPropagator::touchedFile, this, [&touchedFiles](const QString& fileName) {
+ touchedFiles.append(fileName);
+ });
+ });
+
+ const auto syncAndExpectNoTouchedFiles = [&]() {
+ touchedFiles.clear();
+ QVERIFY(fakeFolder.syncOnce());
+ QCOMPARE(touchedFiles.size(), 0);
+ };
+
+ // when nothing changed expect no files to be touched
+ syncAndExpectNoTouchedFiles();
+
+ // when the remote etag of a subsubdir changes expect the parent+subdirs to be touched
+ fakeFolder.remoteModifier().findInvalidatingEtags("directory/subdir");
+ QVERIFY(fakeFolder.syncOnce());
+ QCOMPARE(touchedFiles.size(), 2);
+ QVERIFY(touchedFiles.contains(fakeFolder.localModifier().find("directory/subdir").fileName()));
+ QVERIFY(touchedFiles.contains(fakeFolder.localModifier().find("directory").fileName()));
+
+ // nothing changed again, expect no files to be touched
+ syncAndExpectNoTouchedFiles();
+
+ // when subdir folder permissions change, expect the parent to be touched
+ touchedFiles.clear();
+ fakeFolder.remoteModifier().find("directory")->permissions = RemotePermissions::fromServerString("S");
+ QVERIFY(fakeFolder.syncOnce());
+ QCOMPARE(touchedFiles.size(), 1);
+ QVERIFY(touchedFiles.contains(fakeFolder.localModifier().find("directory").fileName()));
+
+ // another sync without changes, expect no files to be touched
+ syncAndExpectNoTouchedFiles();
+
+ // remote etag of the subdir changed, expect the parent to be touched
+ touchedFiles.clear();
+ fakeFolder.remoteModifier().findInvalidatingEtags("directory");
+ QVERIFY(fakeFolder.syncOnce());
+ QCOMPARE(touchedFiles.size(), 1);
+ QVERIFY(touchedFiles.contains(fakeFolder.localModifier().find("directory").fileName()));
+
+ // same as usual, expect no files to be touched
+ syncAndExpectNoTouchedFiles();
+
+ // remote rename of the subdir folder, expect the new name to be touched
+ touchedFiles.clear();
+ fakeFolder.remoteModifier().rename("directory", "renamedDirectory");
+ QVERIFY(fakeFolder.syncOnce());
+ qDebug() << touchedFiles;
+ QCOMPARE_GT(touchedFiles.size(), 1);
+ QVERIFY(touchedFiles.contains(fakeFolder.localModifier().find("renamedDirectory").fileName()));
+
+ // last sync without changes, expect no files to be touched
+ syncAndExpectNoTouchedFiles();
+ }
};
QTEST_GUILESS_MAIN(TestSyncEngine)
diff -Nru nextcloud-desktop-3.16.4/test/testsyncmove.cpp nextcloud-desktop-3.16.6/test/testsyncmove.cpp
--- nextcloud-desktop-3.16.4/test/testsyncmove.cpp 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/test/testsyncmove.cpp 2025-06-18 22:57:35.000000000 +0200
@@ -326,7 +326,7 @@
fakeFolder.remoteModifier().mkdir("external-storage");
auto externalStorage = fakeFolder.remoteModifier().find("external-storage");
externalStorage->extraDavProperties = "<nc:is-mount-root>true</nc:is-mount-root>";
- setAllPerm(externalStorage, RemotePermissions::fromServerString("WDNVCKRM"));
+ setAllPerm(externalStorage, RemotePermissions::fromServerString("WDNVCKRMG"));
QVERIFY(fakeFolder.syncOnce());
OperationCounter operationCounter;
@@ -812,7 +812,7 @@
{
QFETCH(bool, local);
FakeFolder fakeFolder { FileInfo::A12_B12_C12_S12() };
- auto &modifier = local ? fakeFolder.localModifier() : fakeFolder.remoteModifier();
+ auto &modifier = local ? static_cast<FileModifier&>(fakeFolder.localModifier()) : fakeFolder.remoteModifier();
modifier.mkdir("FolA");
modifier.mkdir("FolA/FolB");
@@ -1159,7 +1159,7 @@
fakeFolder.remoteModifier().mkdir("FolA");
auto groupFolderRoot = fakeFolder.remoteModifier().find("FolA");
groupFolderRoot->extraDavProperties = "<nc:is-mount-root>true</nc:is-mount-root>";
- setAllPerm(groupFolderRoot, RemotePermissions::fromServerString("WDNVCKRM"));
+ setAllPerm(groupFolderRoot, RemotePermissions::fromServerString("WDNVCKRMG"));
fakeFolder.remoteModifier().mkdir("FolA/FolB");
fakeFolder.remoteModifier().mkdir("FolA/FolB/FolC");
fakeFolder.remoteModifier().mkdir("FolA/FolB/FolC/FolD");
@@ -1196,7 +1196,7 @@
fakeFolder.remoteModifier().mkdir("FolA");
auto groupFolderRoot = fakeFolder.remoteModifier().find("FolA");
groupFolderRoot->extraDavProperties = "<nc:is-mount-root>true</nc:is-mount-root>";
- setAllPerm(groupFolderRoot, RemotePermissions::fromServerString("WDNVCKRM"));
+ setAllPerm(groupFolderRoot, RemotePermissions::fromServerString("WDNVCKRMG"));
fakeFolder.remoteModifier().mkdir("FolA/FolB");
fakeFolder.remoteModifier().mkdir("FolA/FolB/FolC");
fakeFolder.remoteModifier().mkdir("FolA/FolB/FolC/FolD");
@@ -1372,6 +1372,54 @@
QVERIFY(dbResult);
QCOMPARE(itemsCounter, 12);
}
+
+ void testRenameFileThatExistsInMultiplePaths()
+ {
+ FakeFolder fakeFolder{FileInfo{}};
+ QObject parent;
+
+ fakeFolder.setServerOverride([&parent](QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *) -> QNetworkReply * {
+ if (op == QNetworkAccessManager::CustomOperation
+ && request.attribute(QNetworkRequest::CustomVerbAttribute).toString() == QStringLiteral("MOVE")) {
+ return new FakeErrorReply(op, request, &parent, 507);
+ }
+ return nullptr;
+ });
+
+ fakeFolder.remoteModifier().mkdir("FolderA");
+ fakeFolder.remoteModifier().mkdir("FolderA/folderParent");
+ fakeFolder.remoteModifier().insert("FolderA/folderParent/FileA.txt");
+ fakeFolder.remoteModifier().mkdir("FolderB");
+ fakeFolder.remoteModifier().mkdir("FolderB/folderChild");
+ fakeFolder.remoteModifier().insert("FolderB/folderChild/FileA.txt");
+ fakeFolder.remoteModifier().mkdir("FolderC");
+
+ const auto fileAFileInfo = fakeFolder.remoteModifier().find("FolderB/folderChild/FileA.txt");
+ const auto fileAInFolderAFolderFileId = fileAFileInfo->fileId;
+ const auto fileAInFolderAEtag = fileAFileInfo->etag;
+ const auto duplicatedFileAFileInfo = fakeFolder.remoteModifier().find("FolderB/folderChild/FileA.txt");
+
+ duplicatedFileAFileInfo->fileId = fileAInFolderAFolderFileId;
+ duplicatedFileAFileInfo->etag = fileAInFolderAEtag;
+
+ QVERIFY(fakeFolder.syncOnce());
+
+ QCOMPARE(fakeFolder.currentLocalState(), fakeFolder.currentRemoteState());
+
+ fakeFolder.localModifier().rename("FolderA/folderParent/FileA.txt", "FolderC/FileA.txt");
+
+ qDebug() << fakeFolder.currentLocalState();
+
+ fakeFolder.syncEngine().setLocalDiscoveryOptions(OCC::LocalDiscoveryStyle::FilesystemOnly);
+ QVERIFY(!fakeFolder.syncOnce());
+
+ qDebug() << fakeFolder.currentLocalState();
+
+ fakeFolder.syncEngine().setLocalDiscoveryOptions(OCC::LocalDiscoveryStyle::FilesystemOnly);
+ QVERIFY(fakeFolder.syncOnce());
+
+ qDebug() << fakeFolder.currentLocalState();
+ }
};
QTEST_GUILESS_MAIN(TestSyncMove)
diff -Nru nextcloud-desktop-3.16.4/translations/client_ar.ts nextcloud-desktop-3.16.6/translations/client_ar.ts
--- nextcloud-desktop-3.16.4/translations/client_ar.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_ar.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>????? ???????? ???????</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>???? ???????? ??????? ??? ??????? ????????? ?? ??????? ????????? ???? ???????? ???? ?? ?????????. ???? ?? ???? ??? ??? ????? ????????? ???? ????? ??? ??????? ?????? ??????? ??????????. ??? ???? ????? ??? ??? ??????? ????? ?? ?????? ??????? ???????? ??? ???? ??? ??????.</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>????? ??????? ??????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -557,7 +549,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>??????? ????</translation>
</message>
@@ -572,7 +564,7 @@
<translation>??????</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>????? ??????? ???????? ?? ????? ?????? ??????,</translation>
</message>
@@ -580,33 +572,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>????? ???????: ?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>????????? ??? ???????? ??? <b>??? ?????</b> ?? ???? ??????? ??? ????? ? ?? ??? ???????? ?? ??? ?????? ?? ????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>?????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>?????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>??? ??????? ?? <server> ?? <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>???? ????</translation>
@@ -637,6 +607,33 @@
<translation>??????? ???????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>????? ???????: ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>??? ??????? ?? <server> ?? <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>?? ??? ????? ?? ?????</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>??????? ?????? E2EE ?? ??????? ??????????</translation>
@@ -671,9 +668,9 @@
<b>?? ???? ??????? ?? ??? ??????? ??????. ?? ??? ????? ??? ???? ?????????? ????</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>?? ??? ????? ?? ?????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -686,6 +683,11 @@
<translation>??? ????????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>??????? ?????? ??? ?????? ???? ??????</translation>
@@ -711,6 +713,12 @@
<translation>????? ?????? ??? ?????? ???? ??? ???????. ?? ???? ????? ?? ????? ?????? ???? ??? ?????? ????? ???????? ?????? ??????.</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -734,12 +742,6 @@
<translation>????? ????? ???????? ???? ???? ?? ??? ???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>??? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>?????</translation>
@@ -778,16 +780,6 @@
<translation>????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>??????? ????????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>???? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>????? ????? ?????? ????????</translation>
@@ -813,21 +805,11 @@
<translation>??? ?? ????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>????? ????? ??????? ????? <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>???? ??? ??? ????? ??????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>?? ??? ??????? ??? ???? ?? ????? ??????? ???????? <i>%1</i>?</p><p><b>???? ??:</b> ??? ???<b>??</b> ????? ?? ??? ??? ?????.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>??? ????? ??????? ????????</translation>
@@ -859,24 +841,24 @@
<translation>???? ???? ????? ??????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>?????? ???? ??????? ?????? ??? ???? ???????? ????????? ?? 12 ???? ???????. ???? ??????? ????????? ??? ?? ?????. ???????? ???????? ??? ????? ????? ???? ??? ????? (??? ????? ??????? ?? ????????? ???????).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>????? ??????? ??????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>????? ??????? ?????? ??????? ??? %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>??? ??????? ?????? ????? ??? ??? ??????? ??????? ???????<br>??? ????? ??????? ????????? ??????? ??? ??????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -889,34 +871,44 @@
<translation>????????? ??????.<br/>?? ???? ?? ???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) of %2 ??? ?????????. ?? ???? ???? ??????????? ? ???? ?????????? ????????? ??? ?????? ?? ?????????? ???????? ???? ??????,</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 ??? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 ?? %2 ??? ?????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>????? ??????? ??? ???? ?????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>?? ???? ??????? ??? ???????? ??? ????? ????? ???????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>????? ?????? ????? ????? %1???? ????: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 ??? ?????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 ?? %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>??????? ?????? ???? ??? ??? ?????? ?? ????? ???.<br> ????? ?????? ??? ?????? ????? ?????? ???? ???? ????? ??????? ?????? <br>??? ??? ???? ?????? ???????? ??????? ????????. </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>????? ?????? %1 ??? ?????! ????? ??? ????????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>????? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>??? ?????? ???? ??????? ??????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -934,79 +926,125 @@
<translation>?????? %1 ?? ???? ????? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>??? ?????? ????? ????? ?????? %1? ?? ?? ?????? ???? ?? ???? ????? ??????? captive portal.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>??? ?????? ?? %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>??????? ?? %1 ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>????? ?????? ?? ??? ???????? ??? ????? ????? ????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>????? ??????? ?? %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>????? ?????? ?? ??? ???????? ????? ????? ????? ??????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>???? ????? ??????: %1 ?? %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>????? ?????? ?? ??? ???????? ??? ????? ????? ???? ?? ????? ????? ????? ??????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>??? ???? ???? ???? ?????? ?? %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>??? ??????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>?? ???? %1 ??????? ????????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>??????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>????? ??????? ??? ???? ?????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>???? ????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>????? ?????? ?? ??? ???????? ??? ????? ????? ????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>????? ????? ??????? ????? <i>%1</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>????? ?????? ?? ??? ???????? ????? ????? ????? ??????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>?? ??? ??????? ??? ???? ?? ????? ??????? ???????? <i>%1</i>?</p><p><b>???? ??:</b> ??? ???<b>??</b> ????? ?? ??? ??? ?????.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>????? ?????? ?? ??? ???????? ??? ????? ????? ???? ?? ????? ????? ????? ??????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>?????? ???? ??????? ?????? ??? ???? ???????? ????????? ?? 12 ???? ???????. ???? ??????? ????????? ??? ?? ?????. ???????? ???????? ??? ????? ????? ???? ??? ????? (??? ????? ??????? ?? ????????? ???????).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>????? ?????? ????? ????? %1???? ????: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>????? ??????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>??????? ?????? ???? ??? ??? ?????? ?? ????? ???.<br> ????? ?????? ??? ?????? ????? ?????? ???? ???? ????? ??????? ?????? <br>??? ??? ???? ?????? ???????? ??????? ????????. </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>????? ??????? ?????? ??????? ??? %1?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>??? ?????? ???? ??????? ??????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>??? ??????? ?????? ????? ??? ??? ??????? ??????? ???????<br>??? ????? ??????? ????????? ??????? ??? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>????? ???????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) of %2 ??? ?????????. ?? ???? ???? ??????????? ? ???? ?????????? ????????? ??? ?????? ?? ?????????? ???????? ???? ??????,</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 ?? %2 ??? ?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>?? ???? ??????? ??? ???????? ??? ????? ????? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 ?? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>????? ?????? %1 ??? ?????! ????? ??? ????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>??? ?????? ????? ????? ?????? %1? ?? ?? ?????? ???? ?? ???? ????? ??????? captive portal.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>??????? ?? %1 ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>????? ??????? ?? %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>???? ????? ??????: %1 ?? %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>??? ???? ???? ???? ?????? ?? %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>?? ???? %1 ??????? ????????.</translation>
</message>
</context>
<context>
@@ -1121,11 +1159,6 @@
<translation>??????? ???????? (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>????? ?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>???? ?? ???????:</translation>
@@ -1136,6 +1169,11 @@
<translation>???? ???? ???????? ???? pkcs12 ??????? ??? ???? ????? ???? ?? ??? ???????.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>????? ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>???? ??????</translation>
@@ -1186,34 +1224,34 @@
<translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 ????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>???? ???? 1</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 ????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>???? ???? 1</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>??????? ???????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1221,12 +1259,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>??? ?? ?????? ??? ??? ??????? configuration file</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>??? ??? ????? ?????? ??? ??? ??????? ??? 1. ???? ?????? ?? ??????? ?????? ??? ????? ?? ???? ????? ?? ??????.</translation>
</message>
@@ -1268,6 +1306,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1275,6 +1352,11 @@
<translation>?? ???? ????? ?????? 1 ????? ????? ??? ??? ???? ??? ?????. ????? ??? ?? ???? ?????? ??????? ? ???????.</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>????? %1? ??? ??? ????? modified time ??? ??? ????. ?? ??? ????? ??? ??????.</translation>
@@ -1479,7 +1561,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>??? ?? ????? ???????? ??????? metadata ?? ????? ????????</translation>
</message>
@@ -1609,21 +1691,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>?? ???? ?? ??? ?????? <i>%1</i> ? ?? ???????? ???? ??????</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>?? ???? ?? ??? ?????? <i>%1</i> ???? ??????</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>???? ????? ?? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1639,30 +1706,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>?? ??? ????? ???? ??? ?????? ?????</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>?? ???? ?? ??? ?????? <i>%1</i> ? ?? ???????? ???? ??????</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>??? ?? ????????: ??? ???????? ?/?? ???? ?????? ???.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>?? ???? ?? ??? ?????? <i>%1</i> ???? ??????</translation>
</message>
<message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>???? ????? ?? ?????</translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
+ <message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>???????? credentials ??????? ??? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>????? ?????? ?? ????? ?????? ??? ????? ????</translation>
@@ -1672,16 +1739,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>???? ??????? ??? ??????? ?????? ?? ?????? ?? ????? ????? ??????.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>??? ?? ????????: ??? ???????? ?/?? ???? ?????? ???.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>?? ??? ????? ???? ??? ?????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>???????? credentials ??????? ??? ?????</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>??? ????? ????? ??? ???</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>??? ????? ????? ??? %1</translation>
</message>
@@ -1689,19 +1771,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>??? ?? ??????: ?? PROPFIND ??? ??? ??? XML!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>??? ?? ??????? ???????? ??????? ???????!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>??? ?? ????? ???????? ??????? ???????: ??????? ??????? ?? ?????? ????.</translation>
</message>
@@ -1709,27 +1791,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>??? ????? ??? ?????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>?? ???? ?????? ?? ??? ??? ??????. ??? ??? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>?????? ??? ?????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>????? ??? ???? ??? ????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>??? ????? ??????? ?? ?????? %1</translation>
</message>
@@ -1968,11 +2050,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>????? URL ????? ???????? polling ?? ???? ?? HTTPS ??? ????? ?? ?? ????? URL ????? ?????? ?????? ???? ?? HTTPS. ?? ???? ????? ?????? ?????? ??? ??? ?? ????? ????? ?????. ?????? ??????? ?????? ?????? ????.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>????? URL ????? ???????? polling ?? ???? ?? HTTPS ??? ????? ?? ?? ????? URL ????? ?????? ?????? ???? ?? HTTPS. ?? ???? ????? ?????? ?????? ??? ??? ?? ????? ????? ?????. ?????? ??????? ?????? ?????? ????.</translation>
@@ -1984,28 +2061,33 @@
<translation>??? ???? ?? ??????: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>????? URL ????? ???????? polling ?? ???? ?? HTTPS ??? ????? ?? ?? ????? URL ????? ?????? ?????? ???? ?? HTTPS. ?? ???? ????? ?????? ?????? ??? ??? ?? ????? ????? ?????. ?????? ??????? ?????? ?????? ????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>????? ??? ?? ?????? ??? ?????? ???????? ?????????? token endpoint ? : <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>????? ????? JSON ??????? ?? ??????: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>?????? ?????? ?? ?????? ?? ???? ?? ?????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>????? ????? JSON ??????? ?? ??????: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2048,6 +2130,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ??? ????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ??? ??????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 ??? ????? ?????? ??? %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 ??? ???? ??? %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>?????? ????? ?????? ???. ???????? %1 ??? ?????.</translation>
@@ -2063,17 +2173,6 @@
<translation>?????? ????? ?????? ???. ???????? %1 ??? ???? ???????.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 ? %n ???(?????) ???? ?? ???????.</numerusform><numerusform>%1 ? %n ???(?????) ???? ?? ???????.</numerusform><numerusform>%1 ? %n ???(?????) ???? ?? ???????.</numerusform><numerusform>%1 ? %n ???(?????) ???? ?? ???????.</numerusform><numerusform>%1 ? %n ???(?????) ???? ?? ???????.</numerusform><numerusform>%1 ? %n ???(?????) ???? ?? ???????.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ??? ????.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>??? ????? %1 ?%n ??? (?????) ????.</numerusform><numerusform>??? ????? %1 ?%n ??? (?????) ????.</numerusform><numerusform>??? ????? %1 ?%n ??? (?????) ????.</numerusform><numerusform>??? ????? %1 ?%n ??? (?????) ????.</numerusform><numerusform>??? ????? %1 ?%n ??? (?????) ????.</numerusform><numerusform>??? ????? %1 ?%n ??? (?????) ????.</numerusform></translation>
@@ -2089,33 +2188,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>?? ????? %1 ?%n ??? (?????) ????.</numerusform><numerusform>?? ????? %1 ?%n ??? (?????) ????.</numerusform><numerusform>?? ????? %1 ?%n ??? (?????) ????.</numerusform><numerusform>?? ????? %1 ?%n ??? (?????) ????.</numerusform><numerusform>?? ????? %1 ?%n ??? (?????) ????.</numerusform><numerusform>?? ????? %1 ?%n ??? (?????) ????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ??? ??????.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>??? ????? ?????? 1 ???? 2 ???? ????? ?????? n ??? (?????) ????.</numerusform><numerusform>??? ????? ?????? 1 ???? 2 ???? ????? ?????? n ??? (?????) ????.</numerusform><numerusform>??? ????? ?????? 1 ???? 2 ???? ????? ?????? n ??? (?????) ????.</numerusform><numerusform>??? ????? ?????? 1 ???? 2 ???? ????? ?????? n ??? (?????) ????.</numerusform><numerusform>??? ????? ?????? 1 ???? 2 ???? ????? ?????? n ??? (?????) ????.</numerusform><numerusform>??? ????? ?????? 1 ???? 2 ???? ????? ?????? n ??? (?????) ????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 ??? ????? ?????? ??? %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>?? ???? 1 ???? 2 ??? ???? n ??? (?????) ????.</numerusform><numerusform>?? ???? 1 ???? 2 ??? ???? n ??? (?????) ????.</numerusform><numerusform>?? ???? 1 ???? 2 ??? ???? n ??? (?????) ????.</numerusform><numerusform>?? ???? 1 ???? 2 ??? ???? n ??? (?????) ????.</numerusform><numerusform>?? ???? 1 ???? 2 ??? ???? n ??? (?????) ????.</numerusform><numerusform>?? ???? 1 ???? 2 ??? ???? n ??? (?????) ????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 ??? ???? ??? %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2152,68 +2234,68 @@
<translation>????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>????? ????? ??? ??????? ?????? system exclude file.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>?????? ???? ???? ???? ?? %1 MB ???? ?????? ???: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>?????? ?? ???? ????? ?????? ???? ??????.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>?????? ???? ??? ????????? ???????? ??? ??? ???? ?? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>????? ?????? ????? ?????? ?????? ? ?? %1 ???? ????: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>?????? ?? ????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>????? ?????? %1 ????? ?????? ?????? ? ?? %2 ???? ????. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>?? ???? ?? ?????? ?? ?????? ??? ???????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>?? ????? ??????? 1 ???? ???? ?? ??? ???????? ?? ??????????? ??? ?????? ???????? ???????? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>?? ????? ?????? 1 ???? ???? ?? ??? ???????? ?? ???????? ??? ??? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2224,41 +2306,41 @@
? 1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>????? ????? ????? ??????? ???? ????: "%1", ??????: "%2" ? ????? ?????: "%3"</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation>??? ?? ??? ??? ???? ?? ??????? ???????? ??? ???????. ???? ??????? ??? ??? ???? ?? ?????? ?????? ????? ???. ????? ?? ???? ????? ??????? ???? ??????? ???????? ?? ???? ??????? ?? ?????? '%1' ??? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation>??? ?? ??? ??? ???? ?? ??????? ?? ?????? ?????? '%1'. ???? ??????? ??? ??? ???? ?? ?????? ?????? ????? ???.????? ?? ???? ????? ??????? ???? ??????? ???????? ?? ???? ??????? ?? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>??? ?? ????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>????? ?? ????? ...</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>?? ???????? ??????? ??? ??????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>?? ???????? ??????? ?? ??????</translation>
</message>
@@ -2299,11 +2381,6 @@
<translation>?????? ????? ????? ???? ??????</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>?? ??????? ??? ??? ?????? ???? "? 1" ? ???? ?? ???? ??????. ???? ?????? ?? ??? ???? ????? ??????? ??????.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation> (??? ???????)</translation>
@@ -2314,6 +2391,11 @@
<translation> (??? ??????? %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>?? ??????? ??? ??? ?????? ???? "? 1" ? ???? ?? ???? ??????. ???? ?????? ?? ??? ???? ????? ??????? ??????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>???? ??? ?????.</translation>
@@ -2384,16 +2466,6 @@
<translation>??? ???????? ??? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>??? ????? ????????.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (???????? ????????)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>?????? ????? ?????? ???. ???????? ???? ?????? ??? ????.</translation>
@@ -2443,6 +2515,16 @@
??? ??? ???????? ?? ???? %1 ?? ??? ???????? ??? ?????? ???? ?????? ????.
??????? ??????????? ?????????? ???? ?? ???? ??? ??????? ?????? ???? ????? ?????? ?????? ???????? ?????? ?? ???? ????. ?? ????? ???? %1 ????? ?? ????? ????? ?????? ????? ? ???? ???????? ?? ??? ???????? .sync_*.db ??? ??????.</translation>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>??? ????? ????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (???????? ????????)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2486,16 +2568,6 @@
<translation>??? ????? ????? ????? ???????? ?? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>??? ????? ???????? ?? ?????? ...</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>???? ??????? ?? ????. ????? ??????? ??? ????????.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>??? ????? ??? ??????? ??????????.</translation>
@@ -2537,16 +2609,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>????? %1/?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>????? %1 ?? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>???? ??????? ?? ????. ????? ??????? ??? ????????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>????? %1/?</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>??? ????? ???????? ?? ?????? ...</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2593,21 +2680,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 ?? %2, ??? %3 ?? %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>????? %1 ?? %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>?? ?????? %n ???? (??????) ??? ...</numerusform><numerusform>?? ?????? %n ???? (??????) ??? ...</numerusform><numerusform>?? ?????? %n ???? (??????) ??? ...</numerusform><numerusform>?? ?????? %n ???? (??????) ??? ...</numerusform><numerusform>?? ?????? %n ???? (??????) ??? ...</numerusform><numerusform>?? ?????? %n ???? (??????) ??? ...</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>??? ??? ??? ????????</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>?? ?????? %n ???? (??????) ??? ...</numerusform><numerusform>?? ?????? %n ???? (??????) ??? ...</numerusform><numerusform>?? ?????? %n ???? (??????) ??? ...</numerusform><numerusform>?? ?????? %n ???? (??????) ??? ...</numerusform><numerusform>?? ?????? %n ???? (??????) ??? ...</numerusform><numerusform>?? ?????? %n ???? (??????) ??? ...</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2767,11 +2849,6 @@
<translation>????????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&????? ??? ??? ????? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>????? ??????? ?????????</translation>
@@ -2782,11 +2859,6 @@
<translation>????? ?????? system tray</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>??????? &???????_??????_?????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>??? ??????? ???????</translation>
@@ -2802,17 +2874,32 @@
<translation>??????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>???? ???????? ??? ??????? ?? ?????? ?????? ????? ????? ???? ?? </translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>???? ????</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>???? ??????? ??? ?????? ????? ??????? ????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&????? ??? ??? ????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>??????? &???????_??????_?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>???? ???????? ??? ??????? ?? ?????? ?????? ????? ????? ???? ?? </translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>?????? ????? ?????? ??? ???????? ???????????? ???? ?????? ?????? </translation>
@@ -2823,11 +2910,6 @@
<translation>?? ?????? ???????? ????? ???? ??? ?? ????? ??? ???????? ???????????? ???? ?????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>???? ??????? ??? ?????? ????? ??????? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>??? ??????? ???????? ??? ??? ????????</translation>
@@ -2879,11 +2961,6 @@
<translation>???? ???????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&???_???????_?_????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>???? ?? ????????? ???? ??????</translation>
@@ -2904,6 +2981,16 @@
<translation>?????? ???????</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&???_???????_?_????</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>??????? ?????? ??? ???????</translation>
@@ -2924,6 +3011,11 @@
<translation>?? ????? ????? ??????? ???????? ???? ?? ????? ??????? ???????? ??? ????? ??????.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>????????</translation>
@@ -3005,6 +3097,11 @@
<source>Debug archive is created at %1</source>
<translation>??? ????? ????? ??????? ?? %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3167,102 +3264,97 @@
<translation>??? ???? ?????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>????? ????? ???</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>?????? ??????? ????? "? 1" ??? ????? ????? ??? ????? ??? ????? ??? ?? ??? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>?????? ??????? ??? ????? ???: * "| &???: \ / ~ <> ???????? ??? ???????? ?? ??????? ? ???????.</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>????? "%1" ?? ???? ???????? ??? ???? ????? ??? ???? ??? ????? ??? ?? ??? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>?????? ??????? ??? ????? ???: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>????? ??????? ?????? ??? ????? ??: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>????? ??????? ??????? ??? ????? ???: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>???????? ??????? ??????? ??? ????? ???: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>???? ?????? ?? ?????? ????? ??????? ...</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>??? ???? ??? ?????? ????? ??? ?????. ???? ?????? ?????? ????? ?????? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>??? ?? ??? ???????? ??? ??? ????? %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>??? ????? ???? ?????? ?? ??????? ?? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>??? ????? ???? ?????? ?? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>??? ????? ???? ?????? ?? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>??????? ??? ??? ?????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>??? ????? ???? ??????? ??? ????? ???: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>?????? ????? ????? ?????. ???? ??? ???? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>?? ???? ????? ????? ????? ??? ????? ??? ???? ????? ????? ?????? ??? ???????. ?????? ?????? ??? ???.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>????? ????? ????? ??? ???? %1</translation>
</message>
@@ -3383,16 +3475,6 @@
<translation><p>????? ????? ???? ?? 1% ????. </p><p><b>2% </b>???? ???????. ??????? ?????? ?? 3%.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>??????? ??? ?????</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>???? ??? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>??? ???????</translation>
@@ -3417,6 +3499,16 @@
<source>Update manually</source>
<translation>????? ????</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>??????? ??? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>???? ??? ???????</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3441,6 +3533,23 @@
<translation>???? ?????? ?????? ????????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>????? ?????? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>???? ???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>???? ????/?????</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>??????: ?? ???? ??????? ?????? ??? ?????? ?????? ??????</translation>
@@ -3463,46 +3572,29 @@
<translation>?????? ????????? ???????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>????? ?????? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>?? ???? ??</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>???? ????/?????</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>???? ???</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>????? ??? 3/4 ?? ??? ?????? ??????? ??????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>????? ?????? ???????</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>????? ?????? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>??? ???? ?????? ??????</translation>
@@ -3531,6 +3623,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>?? ???? ?????? ?? ???? ??????? ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>???? ?????? ?? ???? ????????? ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>????? ???? ???? ?? %1</translation>
@@ -3561,11 +3663,6 @@
<translation>???? ????? ???????. ?????? ???? 1 ?????? ??????? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>?? ???? ?????? ?? ???? ??????? ?????.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>%1 ???? ?????. ???? ??? <a href='%2'>%2</a> ?????? ?????????.</translation>
@@ -3576,16 +3673,21 @@
<translation>%1 ???? ?????. ??? %2 ?????? ?????????? ?? ????.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>???? ?????? ?? ???? ????????? ...</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>???? ??????? ??? ??????: ?? ??? ?????? ?? ???? ??????? ?????.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>?? ???? ??????? ??????. ??????? ????? ?? ?? ???? ?????.</translation>
@@ -3761,11 +3863,6 @@
<translation><font color="green">?? ??????? ????? ?? 1%:2% ??????? 3% (4%)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>????? URL ??? ????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>??? ??????? ?? 1% ??? 2%:<br/>3%</translation>
@@ -3776,6 +3873,16 @@
<translation>????? ?????? ???????? ??????? ?? %1 ?? %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>?????? ????? ?? ??? ??????. ?????? ?? ?? ???? ?? ?????? ????????<a href="%1">???? ??? </a>?? ??? ?????? ??? ?????? ?? ???? ??????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>????? URL ??? ????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>?????? ??????? ?? %1 ?? %2 ...</translation>
@@ -3786,11 +3893,6 @@
<translation>???? ????? ????? ????? ??????? ???? ??? ??????? ??? "%1". ????? URL ????? ??? ?? ????? ??????? ???? ????.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>?????? ????? ?? ??? ??????. ?????? ?? ?? ???? ?? ?????? ????????<a href="%1">???? ??? </a>?? ??? ?????? ??? ?????? ?? ???? ??????.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>???? ???? ??????? ??? ????? ???? WebDAV ??????? ????</translation>
@@ -3999,62 +4101,34 @@
<translation>????? ??????? ???????? ??????? dot ??? ?????? ?? ???? ??????? ???.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>???? </translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>???</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>????? %1 ???? ????? ??? ????? "%2" ??? ????? ?? ???? ??????? ???.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>????? ????? %1 ??? ??? ???? ??? ???? ??? ?????</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>????? %1 ?? ??? ????? ?? ???? ??????? ???.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>??? ????? ???? ????? ?? ???? ?? ?????? ??? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4064,6 +4138,24 @@
<translation>??? ??? ???? ?????? ?? ??????</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>???? </translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>???</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>????? %1 ???? ????? ??? ????? "%2" ??? ????? ?? ???? ??????? ???.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4072,6 +4164,16 @@
<translation>?????? ????? ??????? ?? ?????.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>????? ????? %1 ??? ??? ???? ??? ???? ??? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>????? %1 ?? ??? ????? ?? ???? ??????? ???.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>??? ????? ???? ?????? ?? ??????</translation>
@@ -4162,64 +4264,74 @@
<translation>???? ?????? ?? ??? ???? %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>?????? ???????? ??? ??? ??? ????? ????? ??? ????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>?????? ??? ????? ???? ????? ????? ?? "%1".</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>??? ??? ????? ??? file record ??? ??????? %1 ?? ????? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>?????? ??? ??????? taget ??? ?????. ???????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>????? ????? ?????? ???????? ??? ??????? ??????? ??? ?????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>?? ???????? ???? ??????? ??????? "?????? ?? ???? ???????"</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>??? ????? ??? ???? ??? ???? ?????? ????? ?????? ????? ??? ??? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>??? ????? ??? ???? ??? ???? ?????? ????? ????? ?? ??? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>??? ????? ???? ??? ????? ???? ??????? ??? ??? ???????. ???????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>??? ????? ??????. ???????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>??? ????? ??????? ?? ????? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>??? ??????? ???? ??? ??????? ?? ?????? "%1" : %2</translation>
</message>
@@ -4227,38 +4339,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>????? ??? ????? %1 ?? ????? ???????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>??? ?? ????? ???????? ??????? metadata ???? ?? "??? ??? ????? ?????" ??? ????</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>?????? %1? ?? ???? ???? ??????? ???: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>??????? ??? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>??? ?? ????? ???????? ??????? metadata ? : %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>????? ?? ???? ??????? ???????</translation>
</message>
@@ -4276,12 +4388,6 @@
<translation>????? ????? ????? %1 ??? ??????? ??????? ??????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>???? ????? ??? ???????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4338,6 +4444,12 @@
<source>The file %1 is currently in use</source>
<translation>????? %1 ?? ???? ??????? ???????</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>???? ????? ??? ???????</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4355,39 +4467,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>???? ??? ?????1%? ?????: 2%</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>????? ????? ????? %1 ???? ??????? ?? ??? ??? ???? ?? ???? ????!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>????? ????? ?????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>?????? %1? ?? ???? ???? ??????? ???: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>??????? ??? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>????? ????? ???????? ???????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>????? %1 ?? ???? ??????? ???????</translation>
</message>
@@ -4400,14 +4512,14 @@
<translation>???? ????? 1% ???? ????? ??? ????? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>????? ??? file record ??? ??????? %1 ?? ????? ???????? ???????</translation>
</message>
@@ -4415,49 +4527,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>?????? %1 ?? ???? ????? ?????? ???? ????? ????? ?????? ?? ??? ???? ?? ??? ???? ???!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>????? %1 ??? ??????? ???? ????? ?? ????? ?? ??? ??? ????!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>????? ?????? ??? ????? %1 ?? ????? ???????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>??? ?? ????? ???? ????? pin state</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>??? ?? ????? ???????? ???????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>????? %1 ??? ????????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>??? ?? ??? ????? ?????? ?????? ?? ??????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>??? ?? ????? ??? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>????? ??? ??? ??????? %1 ?? ????? ???????? ???????</translation>
</message>
@@ -4514,39 +4626,39 @@
<translation>?????? ????? %1 ??? %2, ???: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>??? ?? ????? ???????? ???????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>????? %1 ??? ????????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>??? HTTP ????? ???? ?? ???????. ??????? ?? 201? ????? ?????? ?? "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>????? ?????? ??? ????? %1 ?? ????? ???????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>????? ??? ????? %1 ?? ????? ???????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>??? ?? ????? ???? ????? pin state</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>??? ?? ????? ?????? ??????? ??????? ?????? ????????</translation>
</message>
@@ -4554,22 +4666,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>??? ?? ??? ??? ??????.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>?? ???? ??? ?????1% ????? ????? ??? ??? ???? ??? ?????? ?????? ??? ?? ??? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>??? 1% ?????? ????? ??????? ??????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4577,11 +4678,6 @@
<translation>????? %1? ??? "????? ??? ?????" ??? ????. ?? ????? ??? ???????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>???? ????? ????? (??? ?????) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>?? ????? ????? ?????? ????? ????????. ???? ????????.</translation>
@@ -4611,6 +4707,22 @@
<source>The file %1 is currently in use</source>
<translation>????? %1 ??? ????????? ???????</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>??? 1% ?????? ????? ??????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>??? ?? ??? ??? ??????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>???? ????? ????? (??? ?????) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4859,6 +4971,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>?????? ????? ?????? Context menu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>??? ??? ??? ??????? ????? ???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>?????? ????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>????? ???? ??? ??????? ??????????...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>???? ?????? ????? ??? ???????</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>????? ????? ?????? ?? "%1" </translation>
@@ -4891,43 +5029,17 @@
<translation>?????? ?????? ??? ?????? ??????: "%1"</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>?????? ????? ?????? Context menu</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>??? ?????? ?????? ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>??? ??? ??? ??????? ????? ???</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>?????? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>???? ?????? ????? ??? ???????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>????? ???? ??? ??????? ??????????...</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>???? ??? ????????</translation>
@@ -4943,11 +5055,6 @@
<translation>????? ?????? ??? ????? ??? ??????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>??? ???? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>?????</translation>
@@ -4974,12 +5081,6 @@
<translation><numerusform>????? ??????? ?? %1 ?????</numerusform><numerusform>????? ??????? ?? %1 ?????</numerusform><numerusform>????? ??????? ?? %1 ?????</numerusform><numerusform>????? ??????? ?? %1 ?????</numerusform><numerusform>????? ??????? ?? %1 ?????</numerusform><numerusform>????? ??????? ?? %1 ?????</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>??? ?? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>????? ???????? conflict</translation>
@@ -5009,6 +5110,17 @@
<source>Delete</source>
<translation>???</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>??? ???? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>??? ?? ????????</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5110,13 +5222,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>??? ??????? ??? ??? ???? ??? ????
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>???? ??????: %1</translation>
@@ -5136,6 +5241,13 @@
<source>The connection is not secure</source>
<translation>??????? ??? ???</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>??? ??????? ??? ??? ???? ??? ????
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5228,6 +5340,32 @@
<translation>1% (?? ????? ???? ??? ????? ???? ??? ???? ?? 2%)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>????? ??? 1%? ?????? ??? 2% ??? ????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>???? ??? ?? ????? ????? ?????? ???????? ???????. ???? ?? ?? ???? ?? ?????? ??????? ?? ???? ????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>????? ????? ??????: ?? ???? ????????? ???? ?? ????? ?? ???? ??????? ??????? ??? 1.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>?? ???? ????? ????? ??? ?????? ???? ?????? ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>??????? ????? ?????.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>????? ????? ?????: %1</translation>
@@ -5248,22 +5386,6 @@
<translation>????? ????? ??? ??????? ??? ????? ?????? ?????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>??????? ????? ?????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>????? ??? 1%? ?????? ??? 2% ??? ????? ?????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>???? ??? ?? ????? ????? ?????? ???????? ???????. ???? ?? ?? ???? ?? ?????? ??????? ?? ???? ????????.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>??????? ????? ??????? ?? ????? suffix? ??? ?? ??? ???????</translation>
@@ -5283,16 +5405,6 @@
<source>Cannot open the sync journal</source>
<translation>?? ???? ??? ???? ????? ????????</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>????? ????? ??????: ?? ???? ????????? ???? ?? ????? ?? ???? ??????? ??????? ??? 1.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>?? ???? ????? ????? ??? ?????? ???? ?????? ?????.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5303,7 +5415,7 @@
<translation>???? ?????</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>??? ???? ???? ???? ??????</translation>
</message>
@@ -5687,11 +5799,6 @@
<source>Less than a minute</source>
<translation>??? ?? ?????</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5699,20 +5806,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1 ?????</numerusform><numerusform>%1 ?????</numerusform><numerusform>%1 ?????</numerusform><numerusform>%1 ?????</numerusform><numerusform>%1 ?????</numerusform><numerusform>%1 ?????</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1 ????</numerusform><numerusform>%1 ????</numerusform><numerusform>%1 ????</numerusform><numerusform>%1 ?????</numerusform><numerusform>%1 ????</numerusform><numerusform>%1????</numerusform></translation>
@@ -5727,6 +5824,21 @@
<source>%1 days</source>
<translation><numerusform>%1 ???</numerusform><numerusform>%1 ???</numerusform><numerusform>%1 ???</numerusform><numerusform>%1 ????</numerusform><numerusform>%1 ???</numerusform><numerusform>%1 ???</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5869,6 +5981,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>???? ????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>?? ??? ????? ?????? ??????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>??? ??????? ?? %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>????? ???? ??? ?????</translation>
@@ -5889,31 +6016,6 @@
<translation>????? ????? %1 ?? ???? ???? ?????? ??? ??????. ??? ??? ?????? ??? %2 ??????? ???? ?? ?????? ? ????? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>??? ??????? ?? %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>??? ??????? ?? ????????:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>???? %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>???? ????? ??????</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>?? ????? ?????? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5935,11 +6037,6 @@
<translation>macOS VFS?? %1: ??????? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>?? ??? ????? ?????? ??????.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>??????? ?? ????????? ?? '%1' ???????</translation>
@@ -5950,6 +6047,21 @@
<translation>??????? ?? ????????? ?? '%1' ??????</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>??? ??????? ?? ????????:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>???? %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>?? ????? ?????? ??????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5958,11 +6070,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>& ???? ????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>??? ????????</translation>
@@ -5998,22 +6105,11 @@
<translation>???? ??? ?????? ????? ???? ?? </translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>???? ????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>???? ??? ?????? ????? ????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>???? ?? ???? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>????? ????????? ???????</translation>
@@ -6028,6 +6124,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>???? ?????? ?????? ? ???? ?????? ?????</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>???? ????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>???? ?? ???? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>& ???? ????</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6068,6 +6180,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>?????????</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1m</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>????</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>??? ???? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>1%: 2%</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6108,57 +6265,12 @@
<source>Synced %1</source>
<translation>???? ?????? %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>?????????</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>????</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1m</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>??? ???? ?????</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>1%: 2%</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>???????? ???? ???? ???? '#' ??? ?????? ?? ????? VFS.</translation>
@@ -6404,6 +6516,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>??? ???????? ??????? ?? ?????? ????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>??? ?????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>???? ????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>??? ?????? ?????? "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>??? ???? ???????? "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>??? %1 ?? ?????? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>????? ?????? ?????????? ? ???????? ???????</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6593,16 +6748,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>? L1 ????</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 ???? ????</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>? L1 ???? ????</translation>
@@ -6617,6 +6762,16 @@
<source>%L1 KB</source>
<translation>? L1 ????????</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>? L1 ????</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 ???? ????</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6850,16 +7005,16 @@
<translation>??? ??? ????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>??????? ????????</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>????? ????????</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>??????? ????????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>?? ????? ???????? ??????</translation>
@@ -6918,4 +7073,17 @@
<translation>?? ?????? ??????? ???????</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>????? ???????? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>???? ???????? ??????? ??? ??????? ????????? ?? ??????? ????????? ???? ???????? ???? ?? ?????????. ???? ?? ???? ??? ??? ????? ????????? ???? ????? ??? ??????? ?????? ??????? ??????????. ??? ???? ????? ??? ??? ??????? ????? ?? ?????? ??????? ???????? ??? ???? ??? ??????.</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_bg.ts nextcloud-desktop-3.16.6/translations/client_bg.ts
--- nextcloud-desktop-3.16.4/translations/client_bg.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_bg.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
@@ -570,7 +562,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>????? ? ???????????: ...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>?? ????????? ????? ?? ????? <b>??????????</b> ?? ????????? ??????? ??????? ? ???? ?? ????? ?????????????? ?? ???? ???????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>?????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>???????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>??????? ? <server>, ???? <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>????????????? ??????</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>????? ? ???????????: ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>??????? ? <server>, ???? <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>???? ???????? ??????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>???????? ?????????? ? ????????? ???????</translation>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>???? ???????? ??????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation>????????? ?? ?????????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>?????????? ?????????? ???? ?????????? ?? ???? ??????</translation>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -732,12 +740,6 @@
<translation>?? ???? ?? ?? ???????? ?????, ?????? ??????? ???? ?? ??????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>?????? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>??????????</translation>
@@ -776,16 +778,6 @@
<translation>??????????? ????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>???????? ????????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>?????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>???????? ????????????????</translation>
@@ -811,21 +803,11 @@
<translation>??????????? ?? ??????? ?? ???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>????????? ? ??????????? ?? ??????? ?????<i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>????????????? ?? ?????????? ?? ?????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>???????? ?? ??????? ?? ?????????? ???????????????? ?? ???????<i>%1</i>?</p><p><b>???????:</b> ?????????? <b>????</b> ?? ?????????? ????????? ?? ???????.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>????????</translation>
@@ -859,24 +841,24 @@
<translation>?????????? ?????????? ?? ???? ?? ????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>?? ?? ??????? ?????? ????????????? ???????????, ??? ? ?????????? ?????????? ? 12 ???? ?? ???????. ????, ???????? ?? ? ?? ?????? ?? ??????? ?????. ?? ?? ?? ??????????, ?? ?? ???????? ????? ?????????? ??? ????? ?????? (???? ????? ??????? ??????? ??? ??????).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>???????????? ?? ?????????? ??????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>???????????? ?? ?????????? ?????????? ?? %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>???????????? ?? ?????????? ?????????? ?? ???????? ??????? ???????????????? ???????, ????? ?? ?????????. <br> ??????????? ??????? ?? ??????? ?? ???????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -889,34 +871,44 @@
<translation>? ??????? ?? ???????? ??????????????.<br/>?? ???? ?? ???????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>???????? %1 (%3%) ?? %2. ????? ?????, ??????????? ????????? ?? ??????? ??? ????????? ???? ?? ???? ???????? ??????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>???????? %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>???????? %1 ?? %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>? ??????? ???? ???????? ?????????? ?? ???????????? ?? ???????????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>???????? %1</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 ???? %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>?????????? ?????????? ? ?????????? ? ???? ?????? ? ????? ??????????.<br>?? ???? ?? ???? ?????????? ?? ???? ??????????, ???? ???????? ??????????? ??. <br>???? ?? ??????? ?????????????? ?? ?????????????? ?????????? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation> ?????? % 1 ?? ???????? ?? ?? ????????! ?????????? ?? ???? ????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>????????? ?? ??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>???? ?????? ???????? ???????? ??????????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -934,79 +926,125 @@
<translation>???????? %1 ? ? ????? ?? ?????????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>??????? ?? %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>????????? ?? %1 ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>????? ????? ?? ?? ?????????????? ?????? ?? ?????? ??????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>??? ?????, ????? ?? ?? ?????????????? ?????? ?? ?????? ?????????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>?????? ? ?????????????? ?? ???????:% 1 ???% 2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>??? ?????, ????? ?? ?? ?????????????? ?????? ?? ?????? ?????? ??? ?? ?????? ?????????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>?????? ???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>???? %1 ????????????? ??????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>???????? ????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>?????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>????? ????? ?? ?? ?????????????? ?????? ?? ?????? ??????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>????????? ? ??????????? ?? ??????? ?????<i>%1</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>??? ?????, ????? ?? ?? ?????????????? ?????? ?? ?????? ?????????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>???????? ?? ??????? ?? ?????????? ???????????????? ?? ???????<i>%1</i>?</p><p><b>???????:</b> ?????????? <b>????</b> ?? ?????????? ????????? ?? ???????.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>??? ?????, ????? ?? ?? ?????????????? ?????? ?? ?????? ?????? ??? ?? ?????? ?????????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>?? ?? ??????? ?????? ????????????? ???????????, ??? ? ?????????? ?????????? ? 12 ???? ?? ???????. ????, ???????? ?? ? ?? ?????? ?? ??????? ?????. ?? ?? ?? ??????????, ?? ?? ???????? ????? ?????????? ??? ????? ?????? (???? ????? ??????? ??????? ??? ??????).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>???????????? ?? ?????????? ??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>???????????? ?? ?????????? ?????????? ?? %1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>???????????? ?? ?????????? ?????????? ?? ???????? ??????? ???????????????? ???????, ????? ?? ?????????. <br> ??????????? ??????? ?? ??????? ?? ???????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>???????? %1 (%3%) ?? %2. ????? ?????, ??????????? ????????? ?? ??????? ??? ????????? ???? ?? ???? ???????? ??????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>???????? %1 ?? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>? ??????? ???? ???????? ?????????? ?? ???????????? ?? ???????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 ???? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation> ?????? % 1 ?? ???????? ?? ?? ????????! ?????????? ?? ???? ????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>?????????? ?????????? ? ?????????? ? ???? ?????? ? ????? ??????????.<br>?? ???? ?? ???? ?????????? ?? ???? ??????????, ???? ???????? ??????????? ??. <br>???? ?? ??????? ?????????????? ?? ?????????????? ?????????? ?????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>????????? ?? %1 ?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>???? ?????? ???????? ???????? ??????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>????????? ?? ??????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>?????? ? ?????????????? ?? ???????:% 1 ???% 2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>???? %1 ????????????? ??????.</translation>
</message>
</context>
<context>
@@ -1121,11 +1159,6 @@
<translation>?????????? ? ???? (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>??????? ...</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>?????? ?? ??????????:</translation>
@@ -1136,6 +1169,11 @@
<translation>????? ?? ?????????? ??????? ????? pkcs12, ??? ???? ?? ?? ????????? ????? ? ???????????????? ????.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>??????? ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>????? ?? ??????????</translation>
@@ -1186,46 +1224,46 @@
<translation>????????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>?????? ??? ????? ?? ???????? ?? ???????????????? ????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>???????? ?????? ??? ??????? ?? ???????????????? ???? ??? % 1 . ???? ?? ?? ???????, ?? ?????? ? ???????? ?? ?????? ???????? ??????.</translation>
</message>
@@ -1267,6 +1305,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1274,6 +1351,11 @@
<translation>????% 1 ?? ???? ?? ???? ?????, ??? ???? ?????????? ???? ???? ??? ?????? ???, ???? ?? ? ? ????????? ????</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>???? %1 ??? ????????? ??? ?? ???????. ?? ?? ?? ????? ?? ???????.</translation>
@@ -1478,7 +1560,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>??????? ?????? ??? ????? ?? ??????????? ? ?????? ?????</translation>
</message>
@@ -1608,21 +1690,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>?????? ?? ?? ???????? ????????????<i>% 1</i> ? ?????? ? ?????????? ?????????</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>?????? ?? ?? ???????? ????? <i>% 1</i> ?????????</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>????????????? ?? ???????????</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1638,30 +1705,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>???? ???????????? ?????? ? Nextcloud</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>?????? ?? ?? ???????? ????????????<i>% 1</i> ? ?????? ? ?????????? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>?????? ??? ????????????????: ?????? ?????????? ??? ??????.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>?????? ?? ?? ???????? ????? <i>% 1</i> ?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>????????????? ?? ???????????</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>????? ?? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>?????????? ????? ?? ???? ?? ?? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>?????????????? ?????? ?? ???? ?????? ? ????????? ????</translation>
@@ -1671,16 +1738,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>????, ???????? ?? ??-??? ?????? ? ????????????? ???????</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>?????? ??? ????????????????: ?????? ?????????? ??? ??????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>???? ???????????? ?????? ? Nextcloud</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>?????????? ????? ?? ???? ?? ?? ????????</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>?????? ??? ?????? ?? ??????????? ?? ????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>?????? ??? ?????? ?? ??????????? ?? %1</translation>
</message>
@@ -1688,19 +1770,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>?????? ?? ???????: PROPFIND ????????? ?? ? ?????????? ? XML!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1708,27 +1790,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>?????? ??? ???????? ?? ?????????? % 1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>???????????? ?? ? ???????? ?? ???????, ???????????? ? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>???????????? ?? ? ????????:% 1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>?????????? ?? ??? ?? ???? ? ?????????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>?????? ??? ?????? ?? ??????????% 1</translation>
</message>
@@ -1968,11 +2050,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>URL ??????? ?? ?????? ?? ??????? ? HTTPS, ??????? ?? URL ??????? ?? ??????? ??????? ? HTTPS. ????????? ???? ?? ? ????????, ?????? ???? ???? ?? ? ??????? ??? ???????????. ????, ???????? ?? ? ????? ?????????????.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>????????? URL ????? ?? ??????? ?? ??????? ? HTTPS, ??????? ?? URL ??????? ?? ??????? ??????? ? HTTPS. ????????? ???? ?? ? ????????, ?????? ???? ???? ?? ? ??????? ??? ???????????. ????, ???????? ?? ? ????? ?????????????.</translation>
@@ -1984,28 +2061,33 @@
<translation>??????, ??????? ?? ???????: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>URL ??????? ?? ?????? ?? ??????? ? HTTPS, ??????? ?? URL ??????? ?? ??????? ??????? ? HTTPS. ????????? ???? ?? ? ????????, ?????? ???? ???? ?? ? ??????? ??? ???????????. ????, ???????? ?? ? ????? ?????????????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>???????? ?????? ??? ??????? ?? ???????? ????? ????????: <br><em> %1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>?? ???? ?? ?? ????????? JSON, ?????? ?? ???????: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>????????? ?? ??????? ?? ??????? ?????? ???????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>?? ???? ?? ?? ????????? JSON, ?????? ?? ???????: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2048,6 +2130,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ? ?????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ? ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 ? ??????????? ?? %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 ? ????????? ? %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2063,17 +2173,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 ? ?????????.</numerusform><numerusform>%1 ? %n ????? ????? ?? ??????????.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ? ?????????.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 ? %n ???? ????(???) ?? ????????.</numerusform><numerusform>%1 ? %n ???? ????(???) ?? ????????.</numerusform></translation>
@@ -2089,33 +2188,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 ? %n ???? ???? ?? ?????????????.</numerusform><numerusform>%1 ? %n ????? ??????? ?? ?????????????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ? ?????.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ? ??????????? ?? %2.</numerusform><numerusform>%1 ? ??????????? ?? %2 ? %n ????? ????? ?? ????????????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 ? ??????????? ?? %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 ? ????????? ? %2.</numerusform><numerusform>%1 ? ????????? ? %2 ? %n ????? ????? ?? ??????????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 ? ????????? ? %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2152,67 +2234,67 @@
<translation>????????? ?? ??????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>?????? ?? ?????????? ?? ????????? ?? ???? ?? ?? ???????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>???????? ? ???? ????? ??-?????? ?? %1 MB: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>???????? ? ????? ?? ?????? ?????????.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>????, ??????? ? ?????????, ??? ??????? ?? ?? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>??????? % 1 ? ?????????, ?? ????? ???? ? ???? ????????? ?? ???????????????. ??????? ????? ? ??? ???? ?? ????? ??????????????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>??????? % 1 ? ?????????, ?? ????? ???? ? ???? ????????? ?? ???????????????. ??????? ????? ? ??? ???? ?? ????? ??????????????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2225,41 +2307,41 @@
% 1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2300,11 +2382,6 @@
<translation>??????????? ?? ????? ?? ???? ?? ?? ??????</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>??????? ? ???? ??????? ?? ?????????????? ?%1?, ?? ?? ???? ?? ???? ?????????. ???? ?? ?? ???????, ?? ? ??????? ?? ?? ???????? ???? ???? ??????????.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(??????????)</translation>
@@ -2315,6 +2392,11 @@
<translation>(?????????? %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>??????? ? ???? ??????? ?? ?????????????? ?%1?, ?? ?? ???? ?? ???? ?????????. ???? ?? ?? ???????, ?? ? ??????? ?? ?? ???????? ???? ???? ??????????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>???????????? ?????????.</translation>
@@ -2385,16 +2467,6 @@
<translation>???????? ?? ?????????????? ???? ????????.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>???????????????? ? ?? ?????.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (???????????????? ? ?? ?????)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2441,6 +2513,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>???????????????? ? ?? ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (???????????????? ? ?? ?????)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2484,16 +2566,6 @@
<translation>???????? ?????? ??? ??????????? ?? ??????? ? ????? ?? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>????????? ?? ?????? ? ????? ?? ??????? ...</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>??????????? ?????????. ?? ??????????? ???????? ???.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>??????????? ?? ????????? ??????? ? ??????????.</translation>
@@ -2535,16 +2607,31 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>??????????? ?????????. ?? ??????????? ???????? ???.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation type="unfinished"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>????????? ?? ?????? ? ????? ?? ??????? ...</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2591,21 +2678,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 ?? %2, ???? %3 ?? %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>??????? ?? ?? % n ????? ?????(?) ...</numerusform><numerusform>??????? ?? ?? % n ????? ?????(?) ...</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>??????? ?? ?? % n ????? ?????(?) ...</numerusform><numerusform>??????? ?? ?? % n ????? ?????(?) ...</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2765,11 +2847,6 @@
<translation>???? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>??????????? ??????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>????????? ?? ???????? ?? ?????????</translation>
@@ -2780,11 +2857,6 @@
<translation>?? ????????? ????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>?????????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2800,17 +2872,32 @@
<translation>????????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>?????? ?? ????????????, ????? ?? ?????????????? ?????? ?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>??????????? ??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>?????????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2821,11 +2908,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>?????? ?? ????????????, ????? ?? ?????????????? ?????? ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2877,11 +2959,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>& ???????????? && ?????????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation type="unfinished"/>
@@ -2902,6 +2979,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>& ???????????? && ?????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>???????? ?? ???????, ????? ???????? ????????.</translation>
@@ -2922,6 +3009,11 @@
<translation>?? ?????? ?? ???????????? ????????????? ??????????, ?????? ? ?????????? ??????????? ?????????? ? ?????? ???????.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>????????</translation>
@@ -2996,6 +3088,11 @@
<source>Debug archive is created at %1</source>
<translation>????? ?? ???????????? ?? ?????? ? ???????? ?? %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3160,102 +3257,97 @@
<translation>??? ?? ??? ????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>???????????? ?? ????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>?????? %1, ?? ???? ?? ???? ?????????????, ?????? ??????? ?????, ????? ?? ?? ????????? ? ???? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>???????? ????? ?? ?? ????????? ? ?????????: * " | & ? , ; : \ / ~ < > ??????/ ?????? ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>???????? ?? ????? ?? ???????????? ...</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>?????? ????? ?? ???????????? ???? ????. ????, ???????? ?????? ?? ????? ?? ?? ??????????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>????????? ????????? ?? ????? ? ?????? %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>????? ?? ????? ??????? ??????? ? ?????? ?????????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>????? ?? ????? ??????? ??????? ?????????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>????? ?? ????? ??????? ?????? ?????????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>?????????? ?? ????????? ???</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>????? ?? ????? ??????? ??????????? ?????: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>?????? ?? ???? ?? ?? ??????????. ????, ??????? ??, ?? ??? ???????? ??? ???????. </translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>?? ???? ?? ?? ?????????? ????, ?????? ?? ???????, ???? ?????????? ???? ??? ?????? ???. ????, ???????? ????? ???.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>????????? ???? ?? ???? ?? ???? ???????????. %1</translation>
</message>
@@ -3379,16 +3471,6 @@
<translation><p>??????? ? ???? ?????? ?? ??????? %1.</p><p><b>%2</b> ???? ?? ???? ???????. ? ??????? ? ??????????? ?????? %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>????????, ????</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>?????????? ?? ????????????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>????????? ????????????</translation>
@@ -3413,6 +3495,16 @@
<source>Update manually</source>
<translation>????? ?????????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>????????, ????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>?????????? ?? ????????????</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3437,6 +3529,23 @@
<translation>?????? ??????? ??????? ??????????????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>??????? ?? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>?????????? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>?????????: ?????? ??????????? ?? ?? ????????? ?? ??????? ?? ??????? ??????</translation>
@@ -3459,46 +3568,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>??????? ?? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>??? ????????????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>?????????? ??</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>???????????? ?? 3/4 ?? ???????????? ??????????????? ??????????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>??????? ?? ???????</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>??????????? ????????????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>??????? ?? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>??? ?? ?????? ???????</translation>
@@ -3527,6 +3619,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>?????????? ?? ???????????? ?? ???? ?? ???? ?????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>???????? ?? ??????? ?? ???????????? ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>?????? ? ???? ???????????? ?? % 1</translation>
@@ -3557,11 +3659,6 @@
<translation>?????????????? ?? ???? ?? ?? ???????. ????, ???????? %1, ?? ????? ????????? ?? ??????????????.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>?????????? ?? ???????????? ?? ???? ?? ???? ?????????.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>??????? ? ??? % 1. ????, ???????? <a href='%2'>%2</a>, ?? ????????? ?? ??????????????.</translation>
@@ -3572,16 +3669,21 @@
<translation>??????? ? ??? % 1. ????, ???????? %2, ?? ????????? ?? ??????????????.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>???????? ?? ??????? ?? ???????????? ...</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>??????????? ?? ?????????????? ? ??????????: ??????????? ?? ???? ????????????.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>???? ??????? ????????????. ???????? ?????????? ??????.</translation>
@@ -3757,11 +3859,6 @@
<translation><font color="green">??????? ????????? ? %1: %2 ?????? %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>????????? URL ?????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>????????? ????????? ? % 1 ?? ?% 2:<br/>%3</translation>
@@ -3772,6 +3869,16 @@
<translation>????? ?? ????????? ??? ???? ?? ????????? ? % 1 ??? % 2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>???????? ? ???????? ?? ???????. ?? ?? ?? ??????? ???? ????? ???????? ??????<a href="%1"> ???????? ???</a> ? ?? ???????? ?????? ?? ???????? ? ????? ???????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>????????? URL ?????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>???? ?? ?? ?? ?????? ? % 1 ??? % 2 ...</translation>
@@ -3782,11 +3889,6 @@
<translation>?????????????? ?????? ??? ??????? ???? ??????????? ??? ?%1?. URL ??????? ? ???, ???????? ? ?????????? ????????????.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>???????? ? ???????? ?? ???????. ?? ?? ?? ??????? ???? ????? ???????? ??????<a href="%1"> ???????? ???</a> ? ?? ???????? ?????? ?? ???????? ? ????? ???????.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation> ??????? ? ????????? ??????? ?? ???????????? ?????? ?? WebDAV</translation>
@@ -3998,62 +4100,34 @@
<translation>????? ?? ???????, ?????????? ? ?????, ?? ?? ????????? ?? ???? ??????? ???????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>????? ?? ????? ??????? ???? ???? ????????? ????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4063,6 +4137,24 @@
<translation>????? ?? ????? ??????? ?????? ?????????.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4071,6 +4163,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>????? ?? ????? ??????? ??????? ?????????.</translation>
@@ -4161,64 +4263,74 @@
<translation>???????? ? ????? ?? % 1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>?? ???? ?? ?? ???????????? ?????? ????????? ??? ?? ???????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>?????? ??? ????????? ?? ????? ?? ???? %1 ?? ?????? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>?????????? ? ????????? ???, ???????????? ??</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>????????? ?????? ?????? ?????? '???????? ????? ?? ??????????????'</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>?? ? ?????????, ?????? ?????? ????? ?? ???????? ???????? ??? ???? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>?? ? ?????????, ?????? ?????? ????? ?? ???????? ??????? ? ???? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>?? ? ????????? ?? ??????? ???? ????, ??? ???? ??? ? ???? ?? ?????? ?? ???????, ???????????? ??</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>?? ? ????????? ?? ?? ????????, ???????????? ??</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>?????? ??? ?????? ?? ?????? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>???????? ???????? ? ?????? ??? ?????? ?? ?????????? ?%1?: %2</translation>
</message>
@@ -4226,38 +4338,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>?????? ??? ????????????? ?? ??????????? ?????? ????????? ??? ?? ???????????</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>?????? ??? ????????????? ?? ?????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>?????? ? ??????? ?? ????????</translation>
</message>
@@ -4275,12 +4387,6 @@
<translation>???? %1 ?? ???? ?? ???? ????????, ?????? ?????? ?????????? ?? ??????????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>?????? ?? ? ???????? ???? ???????????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4337,6 +4443,12 @@
<source>The file %1 is currently in use</source>
<translation>?????? %1 ? ??????? ?? ????????</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>?????? ?? ? ???????? ???? ???????????</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4354,39 +4466,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>?? ???? ?? ?? ?????? ???? % 1, ??????:% 2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>????? %1 ?? ???? ?? ???? ????????? ?????? ??????? ? ????? ?? ??????? ??????? ??? ?????!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>?? ???? ?? ?? ??????? ????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>?????? ??? ????????????? ?? ?????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>?????? %1 ? ??????? ?? ????????</translation>
</message>
@@ -4399,14 +4511,14 @@
<translation>% 1 ?? ???? ?? ?? ???????? ?????? ??????? ? ????? ?? ??????? ????!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>?? ???? ?? ?? ?????? ????? ?? ???? %1 ?? ????????? ??</translation>
</message>
@@ -4414,49 +4526,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>???? %1 ? ????????, ?? ???? ? ?????? ?? ??????? ? ????? ?? ????????? ???????!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>?????? ??? ??????????? ?? ??????????? ?? ?????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>?????? ??? ????????????? ?? ?????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>?????? %1 ? ??????? ?? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation> ????????? ??????????????? ?? ?????????????? ?? ?????????? ? ??????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>????????? ???????????? ?? ????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>?? ???? ?? ?? ?????? ????? ?? ???? %1 ?? ????????? ??</translation>
</message>
@@ -4513,39 +4625,39 @@
<translation>?? ???? ?? ?? ?????????? % 1 ?? % 2, ??????: % 3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>?????? ??? ????????????? ?? ?????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>?????? %1 ? ??????? ?? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>?????? HTTP ???, ?????? ?? ???????. ???????? 201, ?? ?? ???????? ?% 1% 2?.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>?? ???? ?? ?? ?????? ????? ?? ???? %1 ?? ????????? ??</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>?????? ??? ??????????? ?? ??????????? ?? ?????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>?????? ??? ????????? ?? ????????? ? ?????? ?????</translation>
</message>
@@ -4553,22 +4665,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation> ????????? ??????? ?? ????????? ????.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>????% 1 ?? ???? ?? ???? ?????, ??? ???? ?????????? ???? ???? ??? ?????? ???, ???? ?? ? ? ????????? ????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>????????? ??% 1 ????????? ??????? ?? ???????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4576,11 +4677,6 @@
<translation>???? %1 ??? ????????? ??? ?? ???????????. ?? ?? ?? ????? ?? ???????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>?????? ? ????????? (?????????? ?? ???????) % 1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>??????? ???? ? ???????? ?? ????? ?? ????????????????. ?? ???? ??????????</translation>
@@ -4610,6 +4706,22 @@
<source>The file %1 is currently in use</source>
<translation>?????? %1 ? ??????? ?? ????????</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>????????? ??% 1 ????????? ??????? ?? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation> ????????? ??????? ?? ????????? ????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>?????? ? ????????? (?????????? ?? ???????) % 1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4858,6 +4970,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>????????? ?? ???????????? ????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>???????? ???? ? ???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>????? ?? ?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>????????? ?? ???????? ???????? ?? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>???????? ?? ???????? ???????? ? ?????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>????????? ?????????? ?? ????? ? ?%1?</translation>
@@ -4892,43 +5030,17 @@
<translation>???????? ????? ???? ?????????? ???????: ?%1?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>????????? ?? ???????????? ????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>????? ?? ???? ?????????????? ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>???????? ???? ? ???</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>????? ?? ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>?????????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>???????? ?? ???????? ???????? ? ?????????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>????????? ?? ???????? ???????? ?? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>????????? ?? ???????????</translation>
@@ -4944,11 +5056,6 @@
<translation>?????????? ????????? ?? ???? ????? ?? ? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>???????? ?? ???????? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>??????????</translation>
@@ -4975,12 +5082,6 @@
<translation><numerusform>?????? ???? %1 ??????/?</numerusform><numerusform>?????? ???? %1 ??????/?</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>?????? ? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>??????????? ?? ???????? ...</translation>
@@ -5010,6 +5111,17 @@
<source>Delete</source>
<translation>?????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>???????? ?? ???????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>?????? ? ????????</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5111,13 +5223,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>???????? ?? ? ???????, ??? ???? ?? ? ??????????.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>?????? ?? ???????: %1</translation>
@@ -5137,6 +5242,13 @@
<source>The connection is not secure</source>
<translation>???????? ?? ? ???????</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>???????? ?? ? ???????, ??? ???? ?? ? ??????????.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5229,6 +5341,32 @@
<translation>%1 (?????????? ?????? ??-????? ??????, ???????? ???? ? % 2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>??????? ? ???? % 1, ?? ????????? ??????? ???? % 2</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>?? ???? ?? ?? ?????? ??? ??????? ??????? ???? ????? ?? ??????????????. ??????? ??, ?? ????? ?????? ?? ????? ? ??????? ?? ??????????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>????????? ???????????? ? ?????: ?????????? ?? ??????????, ????? ???? ???????? ?????????? ????? ???% 1.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>?? ??????? ???? ?????????? ????? ?? ????? ????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>??????????? ????????.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>?????? ?? ???? ?? ?? ???????????: %1</translation>
@@ -5249,22 +5387,6 @@
<translation>?? ???? ?? ?? ?????? ????? ?? ???? ? ????????? ??: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>??????????? ????????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>??????? ? ???? % 1, ?? ????????? ??????? ???? % 2</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>?? ???? ?? ?? ?????? ??? ??????? ??????? ???? ????? ?? ??????????????. ??????? ??, ?? ????? ?????? ?? ????? ? ??????? ?? ??????????????.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>?????????? ?? ????????? ??????? ??? ??????, ?? ???????? ?? ? ???????</translation>
@@ -5284,16 +5406,6 @@
<source>Cannot open the sync journal</source>
<translation>?? ???? ?? ?? ?????? ???????? ?? ??????????????.</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>????????? ???????????? ? ?????: ?????????? ?? ??????????, ????? ???? ???????? ?????????? ????? ???% 1.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>?? ??????? ???? ?????????? ????? ?? ????? ????????.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5304,7 +5416,7 @@
<translation>??????</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5669,7 +5781,7 @@
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="369"/>
<source>4 hours</source>
- <translation>4 ????</translation>
+ <translation>4 ????</translation>
</message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="372"/>
@@ -5688,11 +5800,6 @@
<source>Less than a minute</source>
<translation>??-????? ?? ??????</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5700,20 +5807,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5728,6 +5825,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5870,6 +5982,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>????, ??????? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>???? ????? ?? ??????????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>?????????? ? ???????? ? %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>???????? ?? ??????? ?? ?? ????????</translation>
@@ -5890,31 +6017,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>?????????? ? ???????? ? %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>?????????? ? ???????? ? ???????:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>?????? %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>????, ??????? ??</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>???????????????? ? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5936,11 +6038,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>???? ????? ?? ??????????????.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>???????? ?? ?????????? ??????? ?%1?</translation>
@@ -5951,6 +6048,21 @@
<translation>???????? ?? ??????? ??????? ?%1?</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>?????????? ? ???????? ? ???????:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>?????? %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>???????????????? ? ????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5959,11 +6071,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>??????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>??????????</translation>
@@ -5999,22 +6106,11 @@
<translation>?????????, ????? ?? ?????????????? ?????, ??-?????? ??</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>?????????, ????? ?? ?????????????? ?????? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>????? ?? ???????? ?? ??????????????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>????????? ?? ????????? ?????</translation>
@@ -6029,6 +6125,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>???????? ????????? ????? ? ??????????? ?? ????? ??????????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>????? ?? ???????? ?? ??????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>??????? ?????</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6069,6 +6181,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>? ??????</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>????</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>????? ???????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6109,57 +6266,12 @@
<source>Synced %1</source>
<translation>????????????? %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>? ??????</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>????</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>????? ???????? ?????</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6405,6 +6517,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6528,7 +6683,7 @@
<message>
<location filename="../src/gui/UserStatusSelector.qml" line="41"/>
<source>Online status</source>
- <translation>????????? ?? ?????</translation>
+ <translation>?????????</translation>
</message>
<message>
<location filename="../src/gui/UserStatusSelector.qml" line="61"/>
@@ -6568,7 +6723,7 @@
<message>
<location filename="../src/gui/UserStatusSelector.qml" line="194"/>
<source>What is your status?</source>
- <translation>????? ? ?????? ???????</translation>
+ <translation>????? ? ?????? ??????????</translation>
</message>
<message>
<location filename="../src/gui/UserStatusSelector.qml" line="238"/>
@@ -6594,16 +6749,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6618,6 +6763,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6851,16 +7006,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>?????????? ?? ??????????????...</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>?????????? ?? ??????????????...</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>???????????????? ? ?? ?????</translation>
@@ -6919,4 +7074,17 @@
<translation>????????????? ?? ??????? ?????</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_br.ts nextcloud-desktop-3.16.6/translations/client_br.ts
--- nextcloud-desktop-3.16.4/translations/client_br.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_br.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
@@ -570,7 +562,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Lec'h renka? : ...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation><b>Lamet</b> e vo an teuliado? diwiriet eus ar sistem restro? diabarzh ha ne vint ket kempredet d'an urzhiataer-ma? ken</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Nulla?</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Lakaat</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Kemprenn da <server> evel <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Kempred pep tra</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Lakaat</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Lec'h renka? : ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Nulla?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Kemprenn da <server> evel <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Kont arventet ebet.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation type="unfinished"/>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Kont arventet ebet.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation>Diskouez an niver-memor</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation type="unfinished"/>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -731,12 +739,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Digor an teuliad</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Sifra?</translation>
@@ -775,16 +777,6 @@
<translation>Adloc'ha? ar gemprenn</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Kendec'hel ar gemprenn</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Ehani? ar gemprenn</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Lemel an teuliad eus ar genstagadenn kemprenn</translation>
@@ -810,21 +802,11 @@
<translation>C'hwitat krouadenn an teuliad</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>N'eo ke posupl kroui? an teuliad diabarzh <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Gwiria? Lamadenn ar Genstagadenn Kemprenn Teuliad</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Sur oc'h lemel kemprenn an teuliad <i>%1</i> ?</p> <p><b>Notenn :</b> Ne lamo<b>ket</b> restr ebet.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Lemel ar Genstagadenn Kemprenn Teuliad</translation>
@@ -854,23 +836,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -884,36 +866,46 @@
<translation>Ar gemprenn a zo o trei?. <br/> C'hoant ho peus arest anezhi ?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) eus %2 implijet. Teuliado?-so, an teuliado? rannet hag ar rouedad staliat eus oute, e c'hell kaout bevenno? dihe?vel.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 implijet</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 eus %2 implijet</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Titour implij al lec'h renka? ebet evit ar poent. </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 implijet</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Douget e vez gant ar c'hont ar sifra? penn-kil-ha-troad</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
<source>Connected to %1.</source>
<translation>Kenstaget da %1.</translation>
@@ -929,80 +921,126 @@
<translation>Adnevesaet e vez ar servijour %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Aet maez eus %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>O kenstaga? da %1 ...</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Teuliado? so n'int ket bet kempredet peogwir e oant re vras :</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Teuliado? so n'int ket bet kempredet peogwir in lec'hio? klenka? diavaez :</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Teuliado? so n'int ke bet kemredet peogwir e oant pe re vra pe lec'hio? klenka? diavaez :</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Digor an teuliad</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Kendec'hel ar gemprenn</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Ehani? ar gemprenn</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>N'eo ke posupl kroui? an teuliad diabarzh <i>%1</i>.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Sur oc'h lemel kemprenn an teuliad <i>%1</i> ?</p> <p><b>Notenn :</b> Ne lamo<b>ket</b> restr ebet.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Kesntagadenn %1 ebet lakaet.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Teuliado? so n'int ket bet kempredet peogwir e oant re vras :</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) eus %2 implijet. Teuliado?-so, an teuliado? rannet hag ar rouedad staliat eus oute, e c'hell kaout bevenno? dihe?vel.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Teuliado? so n'int ket bet kempredet peogwir in lec'hio? klenka? diavaez :</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 eus %2 implijet</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Teuliado? so n'int ke bet kemredet peogwir e oant pe re vra pe lec'hio? klenka? diavaez :</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Titour implij al lec'h renka? ebet evit ar poent. </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Douget e vez gant ar c'hont ar sifra? penn-kil-ha-troad</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>O kenstaga? da %1 ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Kesntagadenn %1 ebet lakaet.</translation>
+ </message>
</context>
<context>
<name>OCC::AccountSetupFromCommandLineJob</name>
@@ -1116,11 +1154,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Furcha? ...</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Ger-tremen sertifikad:</translation>
@@ -1131,6 +1164,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Furcha? ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Choaz ur sertifikad</translation>
@@ -1181,46 +1219,46 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Ur fazi a zo bet en ur tizhout ar restr arvenntenna?</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation type="unfinished"/>
</message>
@@ -1262,6 +1300,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1269,6 +1346,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
@@ -1473,7 +1555,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>ur fazi a zo bet en ur skriva? ar metadata er roadenn-diaz</translation>
</message>
@@ -1603,21 +1685,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1631,28 +1698,28 @@
%1</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Kont Nextcloud arventennet ebet</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Fazi anaouadur: Fall eo an anv-implijader pe ar ger-tremen.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="183"/>
- <source>Timeout</source>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>An titouro? idantitelez roet n'int ket mat</translation>
+ <location filename="../src/gui/connectionvalidator.cpp" line="183"/>
+ <source>Timeout</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
@@ -1664,16 +1731,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Adnevesit ar servijouar divezha? ha adloc'hit ar c'hliant.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Fazi anaouadur: Fall eo an anv-implijader pe ar ger-tremen.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Kont Nextcloud arventennet ebet</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>An titouro? idantitelez roet n'int ket mat</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation type="unfinished"/>
</message>
@@ -1681,19 +1763,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1701,27 +1783,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1960,11 +2042,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
@@ -1976,28 +2053,33 @@
<translation>Ur fazi a zo bet kavet dre ar servijour : <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Dibosupl dielfenna? ar JSON distroet eus ar servijour : <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>Nen doa ket respont ar servijour pep lec'hiad gortozet</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Dibosupl dielfenna? ar JSON distroet eus ar servijour : <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2040,6 +2122,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 a zo bet lamet</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 a zo bet adnevesaet</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 a zo bet adanvet da %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 a zo bet diblaser da %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2055,17 +2165,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 ha %n restr all a zo bet lamet</numerusform><numerusform>%1 ha %n restr all a zo bet lamet</numerusform><numerusform>%1 ha %n restr all a zo bet lamet</numerusform><numerusform>%1 ha %n restr all a zo bet lamet</numerusform><numerusform>%1 ha %n restr all a zo bet lamet</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 a zo bet lamet</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -2081,33 +2180,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 ha %n restr all a zo bet adnevesaet</numerusform><numerusform>%1 ha %n restr all a zo bet adnevesaet</numerusform><numerusform>%1 ha %n restr all a zo bet adnevesaet</numerusform><numerusform>%1 ha %n restr all a zo bet adnevesaet</numerusform><numerusform>%1 ha %n restr all a zo bet adnevesaet</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 a zo bet adnevesaet</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 a zo bet adanvet da %2 ha %n restr all a zo bet adanvet.</numerusform><numerusform>%1 a zo bet adanvet da %2 ha %n restr all a zo bet adanvet.</numerusform><numerusform>%1 a zo bet adanvet da %2 ha %n restr all a zo bet adanvet.</numerusform><numerusform>%1 a zo bet adanvet da %2 ha %n restr all a zo bet adanvet.</numerusform><numerusform>%1 a zo bet adanvet da %2 ha %n restr all a zo bet adanvet.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 a zo bet adanvet da %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 a zo bet diblaser da %2 ha %n restr all a zo bet diblaset.</numerusform><numerusform>%1 a zo bet diblaser da %2 ha %n restr all a zo bet diblaset.</numerusform><numerusform>%1 a zo bet diblaser da %2 ha %n restr all a zo bet diblaset.</numerusform><numerusform>%1 a zo bet diblaser da %2 ha %n restr all a zo bet diblaset.</numerusform><numerusform>%1 a zo bet diblaser da %2 ha %n restr all a zo bet diblaset.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 a zo bet diblaser da %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2144,67 +2226,67 @@
<translation>Oberiantiz Kemprenna?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Dibosupl lenn ar restr sistem er-maez</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Un teuliad nevez brasoc'h eget %1 MB a zo bet ouzhpennet : %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>An teuliad eus ar lec'h renka? diavaez a zo bet ouzhpennet.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Ket d'an arventenno evit choaz m'ho peus c'hoant da pellkarga? anezha?.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>An teuliad %1 a zo bet krouet mes er-maez eus ar kemprennadenn-ma? eo. Ne vo ket kempredet ar roadenno? e-barzh.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Ar restr %1 a zo bet krouet er-maez eus ar gemprennadenn-ma?. Ne vo ket kempredet.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2217,41 +2299,41 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2292,11 +2374,6 @@
<translation>Dibosupl adlaket d'ar stad orin an teuliad</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(backup)</translation>
@@ -2307,6 +2384,11 @@
<translation>(backup %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation type="unfinished"/>
@@ -2377,16 +2459,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Kemprenn eha?aet</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (kemprenn eha?aet)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2433,6 +2505,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Kemprenn eha?aet</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (kemprenn eha?aet)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2476,16 +2558,6 @@
<translation>Ur fazi a zo bet en ur c'harga? roll teuliado? ar servijour.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Ho paka? roll teuliado? ar servijour ...</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Stourmo? diziskoulmet ez eus. Klikit evit ar munudo?.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation type="unfinished"/>
@@ -2527,16 +2599,31 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Stourmo? diziskoulmet ez eus. Klikit evit ar munudo?.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation type="unfinished"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Ho paka? roll teuliado? ar servijour ...</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2583,21 +2670,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 diwar %2, %3 restr diwar %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>O gortoz %n teuliad all ...</numerusform><numerusform>O gortoz %n teuliad all ...</numerusform><numerusform>O gortoz %n teuliad all ...</numerusform><numerusform>O gortoz %n teuliad all ...</numerusform><numerusform>O gortoz %n teuliad all ...</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>O gortoz %n teuliad all ...</numerusform><numerusform>O gortoz %n teuliad all ...</numerusform><numerusform>O gortoz %n teuliad all ...</numerusform><numerusform>O gortoz %n teuliad all ...</numerusform><numerusform>O gortoz %n teuliad all ...</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2757,11 +2839,6 @@
<translation>Arventenno? hollek</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>%Launch war arSistem Kregi?</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation type="unfinished"/>
@@ -2772,11 +2849,6 @@
<translation>Evit an Tray sistem</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Skeudennigo? Implij &Monochrome</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2792,17 +2864,32 @@
<translation>Araokadennet</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Goulenn an asant a-raok kemprenna lec'hio? renka? diavaez</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>%Launch war arSistem Kregi?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Skeudennigo? Implij &Monochrome</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2813,11 +2900,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Goulenn an asant a-raok kemprenna lec'hio? renka? diavaez</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2869,11 +2951,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Adloc'ha? && Adnevesadenno?</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation type="unfinished"/>
@@ -2894,6 +2971,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Adloc'ha? && Adnevesadenno?</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Kemenadenno? servijour ho deus ezhomm ho hevez.</translation>
@@ -2914,6 +3001,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation type="unfinished"/>
@@ -2988,6 +3080,11 @@
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3152,102 +3249,97 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation type="unfinished"/>
</message>
@@ -3368,16 +3460,6 @@
<translation><p>Ur stumm nevez eus kliant %1 ez eus.</p><p><b>%2</b> a zo posupl pellkarga?. ar stumm staliet a zo %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Lezel hebiou evit ar wech-ma?</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Kaout an adnevesadenn</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation type="unfinished"/>
@@ -3402,6 +3484,16 @@
<source>Update manually</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Lezel hebiou evit ar wech-ma?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Kaout an adnevesadenn</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3426,6 +3518,23 @@
<translation>Proxy ar serivjour en deus edhom eus un dilesa</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Ledandet ar vandenn pellkarga?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Bevenna? da</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>Koktet/e</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation type="unfinished"/>
@@ -3448,46 +3557,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Ledandet ar vandenn pellkarga?</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Bevenn ebet</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>Koktet/e</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Bevenna? da</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Bevenna? da 3/4 ledander ar vandenn ragjedet</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Ledannder ar vandenn pellkas</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Bevenna? en un doare otomatek</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Ledannder ar vandenn pellkas</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Anv oster ar servijour proxy</translation>
@@ -3516,6 +3608,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>Dibosupl gwiria? an adnevesadenno? nevez.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>O gwiria? adnevesadenno? ar serviljour ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation type="unfinished"/>
@@ -3546,11 +3648,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>Dibosupl gwiria? an adnevesadenno? nevez.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation type="unfinished"/>
@@ -3561,16 +3658,21 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>O gwiria? adnevesadenno? ar serviljour ...</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Ar stad adnevesa? a zo dian : N'eo ket bet gwiriet an adnevesadenno? nevez.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Adnevesadenn nevz ebet. Ho staliadur he deus ar stumm divezha?.</translation>
@@ -3746,11 +3848,6 @@
<translation><font color="green">Kenstaget mar da %1 : %2 stumm %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>URL fall</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>C'hwitet d'en em genstaga? da %1 da %2 : <br/>%3</translation>
@@ -3761,6 +3858,16 @@
<translation>Deuet eo an termenn pa glaskemp genstaga?n da %1 da %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>An aksed a zo difennet d'ar servijour. Evit gouzout hag-e? e c'hallit tizhout ar servijer, <a href="%1">klikit ama?</a> evit tizhout servijo? ho furcher.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>URL fall</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Ho klask en em genstaga? da %1 da %2 ...</translation>
@@ -3771,11 +3878,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>An aksed a zo difennet d'ar servijour. Evit gouzout hag-e? e c'hallit tizhout ar servijer, <a href="%1">klikit ama?</a> evit tizhout servijo? ho furcher.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>Ur respont fall d'ar goulenn dilesa WabDAV a zo bet</translation>
@@ -3981,68 +4083,58 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
+ <source>File names containing the character "%1" are not supported on this file system.</source>
+ <comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
- <source>File names containing the character "%1" are not supported on this file system.</source>
- <comment>%1: the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
+ <source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
+ <source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>Folder name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
+ <source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
+ <source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
- <source>File name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="433"/>
+ <source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
- <source>Folder name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
- <source>File name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="433"/>
- <source>Filename contains trailing spaces.</source>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
@@ -4054,6 +4146,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
@@ -4144,64 +4246,74 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation type="unfinished"/>
</message>
@@ -4209,38 +4321,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4258,12 +4370,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>Che?chet eo bet ar restr abaoe m'ema bet disoloet</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4320,6 +4426,12 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>Che?chet eo bet ar restr abaoe m'ema bet disoloet</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4337,39 +4449,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>dibosupl lemel ar restr %1, fazi : %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4382,14 +4494,14 @@
<translation>Dibosupl lemel %1 peogwir d'ur stourm anv restr diabarzh</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4397,49 +4509,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4496,39 +4608,39 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Kod HTTP fall roet gant ar servijour. O gortoz e oa 201, met resevet a zo ber "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>ur fazi a zo bet en ur skriva? ar metadata er roadenn-diaz</translation>
</message>
@@ -4536,22 +4648,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>Ar restr %1 ne c'hell ket beha? pellkaset abalamour m'ez eus ur restr al memes anv, dishe?vel nemet gant ar benlizerenno?/lizerenno?-biha?</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>Pellkarga? %1 a za en tu all ar vevenn quota an teuliad</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4559,11 +4660,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Restr lamet (kregi? ar pellkas) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Restr diabarzh che?chet e pad ar gemprenn. Adkemeret e vo.</translation>
@@ -4593,6 +4689,22 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>Pellkarga? %1 a za en tu all ar vevenn quota an teuliad</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Restr lamet (kregi? ar pellkas) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4841,6 +4953,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Roll kenaroud ranna?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Rannet am eus un dra bennak ganeoc'h</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Dibabo? ranna?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Kas al liamm prevez dre bostel ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Eila al liamm prevez d'ar golver</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4873,43 +5011,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Roll kenaroud ranna?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Rannet am eus un dra bennak ganeoc'h</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Dibabo? ranna?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Eila al liamm prevez d'ar golver</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Kas al liamm prevez dre bostel ...</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4925,11 +5037,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Eila? al liammm diabarzh</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -4956,12 +5063,6 @@
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Digeri? er furcher</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation type="unfinished"/>
@@ -4991,6 +5092,17 @@
<source>Delete</source>
<translation>Dilemel</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Eila? al liammm diabarzh</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Digeri? er furcher</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5092,13 +5204,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>N'eo KET sur ar genstagadenn abalamour n'eo ket sifret.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Stumm servijour : %1</translation>
@@ -5118,6 +5223,13 @@
<source>The connection is not secure</source>
<translation>N'eo ket sur ar genstagadenn</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>N'eo KET sur ar genstagadenn abalamour n'eo ket sifret.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5210,6 +5322,32 @@
<translation>%1 (lezet hebiou abalamour d'ar fazi kent, klasket e vo en-dro a benn %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Nez eus nemet %1 dieub, ret eo kaout %2 d'an neubeuta? evit kregi?</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>Dibosupl digeri? pe kroui? ar rouadenn-diaz kemprennet diabarzh. Bezit sur ho peus an aotre embann en teuliad kemprenn.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Plas el lenner re vihan : ar bellgargadenno? a lako ar plas dieub da mont dindan %1 a vo ankouaet.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>N'ez eus ket trawalc'h a blas war ar servijour evit pelgasadenno? zo.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Stroum diziskoulmet.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation type="unfinished"/>
@@ -5230,22 +5368,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Stroum diziskoulmet.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Nez eus nemet %1 dieub, ret eo kaout %2 d'an neubeuta? evit kregi?</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>Dibosupl digeri? pe kroui? ar rouadenn-diaz kemprennet diabarzh. Bezit sur ho peus an aotre embann en teuliad kemprenn.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
@@ -5265,16 +5387,6 @@
<source>Cannot open the sync journal</source>
<translation>Dibosupl eo digeri? ar gazetenn kemprenn</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Plas el lenner re vihan : ar bellgargadenno? a lako ar plas dieub da mont dindan %1 a vo ankouaet.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>N'ez eus ket trawalc'h a blas war ar servijour evit pelgasadenno? zo.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5285,7 +5397,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5669,11 +5781,6 @@
<source>Less than a minute</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5681,20 +5788,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5709,6 +5806,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5851,6 +5963,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Inskrivit ac'honoc'h</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>N'ez eus teuliad kemprenn ebet.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Digemprennet eus %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Ar stumm servijour n'eo ket douget</translation>
@@ -5871,31 +5998,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Digemprennet eus %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Digemprennet eus ar c'honto? :</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Lont %1 : %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Inskrivit ac'honoc'h</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Kemprenn kont disaotreet</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5917,11 +6019,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>N'ez eus teuliad kemprenn ebet.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation type="unfinished"/>
@@ -5932,6 +6029,21 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Digemprennet eus ar c'honto? :</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Lont %1 : %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Kemprenn kont disaotreet</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5940,11 +6052,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Teuliad diabarzh</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation type="unfinished"/>
@@ -5980,22 +6087,11 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Choazit petra kemprenna?</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation type="unfinished"/>
@@ -6010,6 +6106,22 @@
<source>Erase local folder and start a clean sync</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Choazit petra kemprenna?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Teuliad diabarzh</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6050,6 +6162,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>en dazont</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>brema?</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Neubeut amzer-zo</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1 : %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6090,57 +6247,12 @@
<source>Synced %1</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>en dazont</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>brema?</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Neubeut amzer-zo</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1 : %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6386,6 +6498,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6575,16 +6730,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6599,6 +6744,16 @@
<source>%L1 KB</source>
<translation>%L1 KM</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6832,16 +6987,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Ho prienti? ur gemprennadenn</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Ho prienti? ur gemprennadenn</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Ehanet ar gemprenn</translation>
@@ -6900,4 +7055,17 @@
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_ca.ts nextcloud-desktop-3.16.6/translations/client_ca.ts
--- nextcloud-desktop-3.16.4/translations/client_ca.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_ca.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
@@ -570,7 +562,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Espai d'emmagatzematge: ?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Les carpetes sense marcar <b>se suprimiran</b> del vostre sistema de fitxers local i ja no se sincronitzaran en aquest ordinador</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Cancel?la</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Aplica</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Connectat amb <server> com a <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Sincronitza-ho tot</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Aplica</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Espai d'emmagatzematge: ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Cancel?la</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Connectat amb <server> com a <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>No s'ha configurat cap compte.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>Xifratge d'extrem a extrem amb Fitxers virtuals</translation>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>No s'ha configurat cap compte.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation>Mostra la clau mnemot?cnica</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>S'ha habilitat el xifratge d'extrem a extrem per a aquest compte</translation>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -731,12 +739,6 @@
<translation>No s'ha pogut encriptar la carpeta perqu? ja no existeix</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Obre la carpeta</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Xifra</translation>
@@ -775,16 +777,6 @@
<translation>Reinicia la sincronitzaci?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Repr?n la sincronitzaci?</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Atura la sincronitzaci?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Suprimeix la connexi? de la carpeta sincronitzada</translation>
@@ -810,21 +802,11 @@
<translation>S'ha produ?t un error en crear la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>No s'ha pogut crear la carpeta local <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmeu la supressi? de la connexi? de la carpeta sincronitzada</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Segur que voleu deixar de sincronitzar la carpeta <i>%1</i>?</p><p><b>Nota:</b> aix? <b>no</b> suprimir? cap fitxer.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Suprimeix la connexi? de la carpeta sincronitzada</translation>
@@ -858,23 +840,23 @@
<translation>Clau mnemot?cnica del xifratge d'extrem a extrem</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>Per a protegir la vostra identitat criptogr?fica, la xifrarem amb una clau mnemot?cnica de 12 paraules del diccionari. Anoteu-les i deseu-les en un lloc segur. Les necessitareu per a afegir altres dispositius al vostre compte (com ara un tel?fon m?bil o un port?til).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -888,34 +870,44 @@
<translation>S'est? executant una operaci? de sincronitzaci?.<br/>Voleu aturar-la?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) de %2 en ?s. Algunes carpetes, incloent-hi les carpetes muntades a trav?s de la xarxa o les carpetes compartides, poden tenir l?mits diferents.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 en ?s</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 de %2 en ?s</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Actualment no hi ha informaci? disponible sobre l'?s de l'emmagatzematge.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 en ?s</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 com a %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>El xifratge d'extrem a extrem s'ha habilitat en aquest compte amb un altre dispositiu.<br>Es pot habilitar en aquest dispositiu introduint la vostra clau mnemot?cnica.<br>Aix? permetr? la sincronitzaci? de les carpetes xifrades existents.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>La versi? del servidor (%1) ha quedat obsoleta. Continueu sota la vostra responsabilitat.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Habilita el xifratge</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Aquest compte admet el xifratge d'extrem a extrem</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -933,79 +925,125 @@
<translation>El servidor %1 es troba en mode de manteniment.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>S'ha sortit de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>S'est? connectant a %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Hi ha carpetes que no s'han sincronitzat perqu? s?n massa grans: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Hi ha carpetes que no s'han sincronitzat perqu? s?n fonts d'emmagatzematge extern: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Error de configuraci? del servidor: %1 a %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Hi ha carpetes que no s'han sincronitzat perqu? s?n massa grans o s?n fonts d'emmagatzematge extern: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Obre la carpeta</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Repr?n la sincronitzaci?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Atura la sincronitzaci?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>No s'ha pogut crear la carpeta local <i>%1</i>.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Segur que voleu deixar de sincronitzar la carpeta <i>%1</i>?</p><p><b>Nota:</b> aix? <b>no</b> suprimir? cap fitxer.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>Per a protegir la vostra identitat criptogr?fica, la xifrarem amb una clau mnemot?cnica de 12 paraules del diccionari. Anoteu-les i deseu-les en un lloc segur. Les necessitareu per a afegir altres dispositius al vostre compte (com ara un tel?fon m?bil o un port?til).</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>No s'ha configurat cap connexi? a %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Hi ha carpetes que no s'han sincronitzat perqu? s?n massa grans: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) de %2 en ?s. Algunes carpetes, incloent-hi les carpetes muntades a trav?s de la xarxa o les carpetes compartides, poden tenir l?mits diferents.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Hi ha carpetes que no s'han sincronitzat perqu? s?n fonts d'emmagatzematge extern: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 de %2 en ?s</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Hi ha carpetes que no s'han sincronitzat perqu? s?n massa grans o s?n fonts d'emmagatzematge extern: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Actualment no hi ha informaci? disponible sobre l'?s de l'emmagatzematge.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 com a %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>La versi? del servidor (%1) ha quedat obsoleta. Continueu sota la vostra responsabilitat.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>El xifratge d'extrem a extrem s'ha habilitat en aquest compte amb un altre dispositiu.<br>Es pot habilitar en aquest dispositiu introduint la vostra clau mnemot?cnica.<br>Aix? permetr? la sincronitzaci? de les carpetes xifrades existents.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>S'est? connectant a %1?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Aquest compte admet el xifratge d'extrem a extrem</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Habilita el xifratge</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Error de configuraci? del servidor: %1 a %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>No s'ha configurat cap connexi? a %1.</translation>
</message>
</context>
<context>
@@ -1120,11 +1158,6 @@
<translation>Certificat i clau (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Navega?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Contrasenya del certificat:</translation>
@@ -1135,6 +1168,11 @@
<translation>Es recomana un paquet pkcs12 xifrat, ja que s'emmagatzemar? una c?pia en el fitxer de configuraci?.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Navega?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Seleccioneu un certificat</translation>
@@ -1185,46 +1223,46 @@
<translation>Continua</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>S'ha produ?t un error en accedir al fitxer de configuraci?</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>S'ha produ?t un error en accedir al fitxer de configuraci? a %1. Assegureu-vos que el vostre compte del sistema pugui accedir al fitxer.</translation>
</message>
@@ -1266,6 +1304,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1273,6 +1350,11 @@
<translation>No es pot pujar el fitxer %1 perqu? existeix un altre fitxer amb el mateix nom que nom?s es distingeix per les maj?scules i les min?scules</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>El fitxer %1 t? una hora modificada no v?lida. No el pugis al servidor.</translation>
@@ -1477,7 +1559,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>S'ha produ?t un error en escriure les metadades a la base de dades</translation>
</message>
@@ -1607,21 +1689,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Voleu suprimir la carpeta <i>%1</i> i tot el contingut de manera permanent?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Voleu suprimir el fitxer <i>%1</i> de manera permanent?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Confirmeu la supressi?</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1637,30 +1704,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>No s'ha configurat cap compte del Nextcloud</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Voleu suprimir la carpeta <i>%1</i> i tot el contingut de manera permanent?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Error d'autenticaci?: el nom d'usuari o la contrasenya s?n incorrectes.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Voleu suprimir el fitxer <i>%1</i> de manera permanent?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Confirmeu la supressi?</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>S'ha esgotat el temps d'espera</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Les credencials proporcionades no s?n correctes</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>El servidor configurat per a aquest client ?s massa antic</translation>
@@ -1670,16 +1737,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Actualitzeu el servidor a la versi? m?s recent i reinicieu el client.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Error d'autenticaci?: el nom d'usuari o la contrasenya s?n incorrectes.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>No s'ha configurat cap compte del Nextcloud</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Les credencials proporcionades no s?n correctes</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>S'ha produ?t un error en cancel?lar la supressi? d'un fitxer</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>S'ha produ?t un error en cancel?lar la supressi? de %1</translation>
</message>
@@ -1687,19 +1769,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Error del servidor: la resposta PROPFIND no t? el format XML.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1707,27 +1789,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Error en obrir la carpeta %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>La carpeta no ?s accessible en el client; s'ha denegat el perm?s</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>No s'ha trobat la carpeta: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>La codificaci? del nom de fitxer no ?s v?lida.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Error en llegir la carpeta %1</translation>
</message>
@@ -1966,11 +2048,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
@@ -1982,28 +2059,33 @@
<translation>S'ha produ?t un error en el servidor: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>No s'ha pogut analitzar el JSON retornat des del servidor: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>La resposta del servidor no contenia tots els camps esperats</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>No s'ha pogut analitzar el JSON retornat des del servidor: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2046,6 +2128,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>S'ha suprimit ?%1?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>S'ha actualitzat %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>S'ha canviat el nom de %1 a %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>S'ha mogut %1 a %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2061,17 +2171,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>S'han suprimit %1 i %n fitxer m?s.</numerusform><numerusform>S'han suprimit %1 i %n fitxers m?s.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>S'ha suprimit ?%1?.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>S'han afegit %1 i %n fitxer m?s.</numerusform><numerusform>S'han afegit %1 i %n fitxers m?s.</numerusform></translation>
@@ -2087,33 +2186,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>S'han actualitzat %1 i %n fitxer m?s.</numerusform><numerusform>S'han actualitzat %1 i %n fitxers m?s.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>S'ha actualitzat %1.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>S'ha canviat el nom de %1 a %2 i d'%n fitxer m?s.</numerusform><numerusform>S'ha canviat el nom de %1 a %2 i de %n fitxers m?s.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>S'ha canviat el nom de %1 a %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>S'ha mogut %1 a %2 i %n fitxer m?s.</numerusform><numerusform>S'ha mogut %1 a %2 i %n fitxers m?s.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>S'ha mogut %1 a %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2150,67 +2232,67 @@
<translation>Activitat de sincronitzaci?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>No s'ha pogut llegir el fitxer d'exclusi? del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>S'ha afegit una carpeta amb una mida superior a %1 MB: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>S'ha afegit una carpeta d'una font d'emmagatzematge extern.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Aneu als par?metres per a seleccionar si voleu baixar-la.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>S'ha creat la carpeta %1 per? ha estat exclosa de la sincronitzaci? anteriorment. Les dades que cont? no se sincronitzaran.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>S'ha creat el fitxer %1 per? ha estat exclosa de la sincronitzaci? anteriorment. No se sincronitzar?.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2219,41 +2301,41 @@
<translation>No s'ha pogut fer un seguiment fiable dels canvis en les carpetes sincronitzades. Aix? significa que ?s possible que el client de sincronitzaci? no pugui carregar els canvis locals immediatament i, en canvi, nom?s cercar? els canvis locals i els pujar? ocasionalment (per defecte, cada dues hores). %1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2294,11 +2376,6 @@
<translation>No s'ha pogut restaurar l'estat de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation> (c?pia de seguretat)</translation>
@@ -2309,6 +2386,11 @@
<translation> (c?pia de seguretat %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation type="unfinished"/>
@@ -2379,16 +2461,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>La sincronitzaci? est? en pausa.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (la sincronitzaci? est? en pausa)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2435,6 +2507,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>La sincronitzaci? est? en pausa.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (la sincronitzaci? est? en pausa)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2478,16 +2560,6 @@
<translation>S'ha produ?t un error en carregar la llista de carpetes del servidor.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>S'est? recuperant la llista de carpetes del servidor?</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Hi ha conflictes sense resoldre. Feu clic per a veure m?s detalls.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>La compatibilitat amb els fitxers virtuals est? habilitada.</translation>
@@ -2529,16 +2601,31 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Hi ha conflictes sense resoldre. Feu clic per a veure m?s detalls.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation type="unfinished"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>S'est? recuperant la llista de carpetes del servidor?</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2585,21 +2672,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 de %2, fitxer %3 de %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>S'est? esperant %n carpeta m?s?</numerusform><numerusform>S'estan esperant %n carpetes m?s?</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>S'est? esperant %n carpeta m?s?</numerusform><numerusform>S'estan esperant %n carpetes m?s?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2759,11 +2841,6 @@
<translation>Par?metres generals</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Executa en iniciar el sistema</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation type="unfinished"/>
@@ -2774,11 +2851,6 @@
<translation>Per la safata del sistema</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Utilitza les icones &monocrom?tiques</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2794,17 +2866,32 @@
<translation>Avan?at</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Demana la confirmaci? abans de sincronitzar fonts d'emmagatzematge extern</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Executa en iniciar el sistema</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Utilitza les icones &monocrom?tiques</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2815,11 +2902,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Demana la confirmaci? abans de sincronitzar fonts d'emmagatzematge extern</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2871,11 +2953,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Reinicia i actualitza</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation type="unfinished"/>
@@ -2896,6 +2973,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Reinicia i actualitza</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Notificacions del servidor que requereixen atenci?.</translation>
@@ -2916,6 +3003,11 @@
<translation>No podeu inhabilitar l'inici autom?tic perqu? l'inici autom?tic per a tot el sistema est? habilitat.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>estable</translation>
@@ -2990,6 +3082,11 @@
<source>Debug archive is created at %1</source>
<translation>S'ha creat l'arxiu de depuraci? a %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3150,102 +3247,97 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation type="unfinished"/>
</message>
@@ -3368,16 +3460,6 @@
<translation><p>Hi ha disponible una nova versi? del client del %1.</p> <p>Ja es pot baixar la versi? <b>%2</b>. La versi? instal?lada ?s la %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Omet aquesta vegada</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Obt?n l'actualitzaci?</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>L'actualitzaci? ha fallat</translation>
@@ -3402,6 +3484,16 @@
<source>Update manually</source>
<translation>Actualitza manualment</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Omet aquesta vegada</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Obt?n l'actualitzaci?</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3426,6 +3518,23 @@
<translation>El servidor intermediari requereix autenticaci?</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Amplada de banda de baixada</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Limita a</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>Nota: els par?metres del servidor intermediari no tenen efecte per als comptes en localhost</translation>
@@ -3448,46 +3557,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Amplada de banda de baixada</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Sense l?mit</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Limita a</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Limita a 3/4 de l'amplada de banda estimada</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Amplada de banda de pujada</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Limita autom?ticament</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Amplada de banda de pujada</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Nom de l'amfitri? del servidor intermediari</translation>
@@ -3516,6 +3608,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>No s'ha pogut comprovar si hi ha noves actualitzacions.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>S'est? comprovant el servidor d'actualitzacions?</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation type="unfinished"/>
@@ -3546,11 +3648,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>No s'ha pogut comprovar si hi ha noves actualitzacions.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation type="unfinished"/>
@@ -3561,16 +3658,21 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>S'est? comprovant el servidor d'actualitzacions?</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Es desconeix l'estat de les actualitzacions: no s'ha comprovat si hi ha actualitzacions noves.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>No hi ha actualitzacions disponibles. Teniu instal?lada la versi? m?s recent.</translation>
@@ -3746,11 +3848,6 @@
<translation><font color="green">Connectat correctament a %1: %2 versi? %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>L'URL no ?s v?lid</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>No s'ha pogut connectar a %1 a %2:<br/>%3</translation>
@@ -3761,6 +3858,16 @@
<translation>S'ha esgotat el temps d'espera en connectar-se a %1 a %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>El servidor ha prohibit l'acc?s. Per a comprovar que hi teniu acc?s, <a href="%1">feu clic aqu?</a> per a accedir al servei amb el vostre navegador.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>L'URL no ?s v?lid</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>S'est? intentant la connexi? a %1 a %2?</translation>
@@ -3771,11 +3878,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>El servidor ha prohibit l'acc?s. Per a comprovar que hi teniu acc?s, <a href="%1">feu clic aqu?</a> per a accedir al servei amb el vostre navegador.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>S'ha rebut una resposta no v?lida a una sol?licitud WebDAV autenticada</translation>
@@ -3981,62 +4083,34 @@
<translation>No s'admeten els noms de fitxer que finalitzen amb un punt en aquest sistema de fitxers.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>El nom del fitxer cont? com a m?nim un car?cter no v?lid</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4046,6 +4120,24 @@
<translation>El nom del fitxer cont? espais finals.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4054,6 +4146,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
@@ -4144,64 +4246,74 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>S'ha mogut a una destinaci? no v?lida; s'est? restaurant</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>S'ha ignorat perqu? es troba a la llista de prohibicions ?Trieu qu? voleu sincronitzar?</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>No es permet perqu? no teniu perm?s per a afegir subcarpetes en aquesta carpeta</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>No es permet perqu? no teniu perm?s per a afegir fitxers en aquesta carpeta</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>No es permet carregar aquest fitxer perqu? ?s de nom?s lectura en el servidor; s'est? restaurant</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>No es permet suprimir; s'est? restaurant</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Error while reading the database</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation type="unfinished"/>
</message>
@@ -4209,38 +4321,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4258,12 +4370,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>El fitxer ha canviat des del descobriment</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4320,6 +4426,12 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>El fitxer ha canviat des del descobriment</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4337,39 +4449,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>no s'ha pogut suprimir el fitxer %1, error: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4382,14 +4494,14 @@
<translation>No s'ha pogut suprimir %1 perqu? hi ha un conflicte amb el nom d'un fitxer local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4397,49 +4509,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Error en establir l'estat d'ancoratge</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4496,39 +4608,39 @@
<translation>No s'ha pogut canviar el nom de ?%1? a ?%2?; error: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>El servidor ha retornat un codi HTTP incorrecte. S'esperava el codi 201, per? s'ha rebut ?%1 %2?.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Error en establir l'estat d'ancoratge</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>S'ha produ?t un error en escriure les metadades a la base de dades</translation>
</message>
@@ -4536,22 +4648,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>No es pot pujar el fitxer %1 perqu? existeix un altre fitxer amb el mateix nom que nom?s es distingeix per les maj?scules i les min?scules</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>La pujada de %1 supera la quota de la carpeta</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4559,11 +4660,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>S'ha suprimit el fitxer (inicia la c?rrega) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>El fitxer local ha canviat durant la sincronitzaci?. Es reprendr?.</translation>
@@ -4593,6 +4689,22 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>La pujada de %1 supera la quota de la carpeta</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>S'ha suprimit el fitxer (inicia la c?rrega) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4841,6 +4953,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Compartici? del men? contextual</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>He compartit una cosa amb tu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Opcions de compartici?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Envia l'enlla? privat per correu electr?nic?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Copia l'enlla? privat al porta-retalls</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4873,43 +5011,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Compartici? del men? contextual</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Seleccioneu una ubicaci? nova?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>He compartit una cosa amb tu</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Opcions de compartici?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Copia l'enlla? privat al porta-retalls</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Envia l'enlla? privat per correu electr?nic?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4925,11 +5037,6 @@
<translation>No es permet tornar a compartir la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Copia l'enlla? intern</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -4956,12 +5063,6 @@
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Obre en el navegador</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Resol el conflicte?</translation>
@@ -4991,6 +5092,17 @@
<source>Delete</source>
<translation>Suprimeix</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Copia l'enlla? intern</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Obre en el navegador</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5092,13 +5204,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Aquesta connexi? NO ?s segura perqu? no est? xifrada.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Versi? del servidor: %1</translation>
@@ -5118,6 +5223,13 @@
<source>The connection is not secure</source>
<translation>La connexi? no ?s segura.</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Aquesta connexi? NO ?s segura perqu? no est? xifrada.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5210,6 +5322,32 @@
<translation>%1 (s'ha om?s a causa d'un error anterior, torneu-ho a provar d'aqu? a %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Nom?s hi ha %1 disponibles, necessiteu com a m?nim %2 per a comen?ar</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>No es pot obrir o crear la base de dades de sincronitzaci? local. Assegureu-vos que teniu acc?s d'escriptura a la carpeta de sincronitzaci?.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Queda poc espai en el disc: s'han om?s les baixades que reduirien l'espai lliure per sota de %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>No hi ha prou espai en el servidor per a pujar-hi alguns fitxers.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Conflicte sense resoldre.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation type="unfinished"/>
@@ -5230,22 +5368,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Conflicte sense resoldre.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Nom?s hi ha %1 disponibles, necessiteu com a m?nim %2 per a comen?ar</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>No es pot obrir o crear la base de dades de sincronitzaci? local. Assegureu-vos que teniu acc?s d'escriptura a la carpeta de sincronitzaci?.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>S'estan utilitzant fitxers virtuals amb sufix per? no s'ha definit el sufix</translation>
@@ -5265,16 +5387,6 @@
<source>Cannot open the sync journal</source>
<translation>No es pot obrir el diari de sincronitzaci?</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Queda poc espai en el disc: s'han om?s les baixades que reduirien l'espai lliure per sota de %1.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>No hi ha prou espai en el servidor per a pujar-hi alguns fitxers.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5285,7 +5397,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5669,11 +5781,6 @@
<source>Less than a minute</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5681,20 +5788,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5709,6 +5806,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5851,6 +5963,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Inicieu la sessi?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>No s'ha configurat cap carpeta de sincronitzaci?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Desconnectat de %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>La versi? del servidor no ?s compatible</translation>
@@ -5871,31 +5998,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Desconnectat de %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Desconnectat dels comptes:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Compte %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Inicieu la sessi?</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>La sincronitzaci? del compte est? inhabilitada</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5917,11 +6019,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>No s'ha configurat cap carpeta de sincronitzaci?.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation type="unfinished"/>
@@ -5932,6 +6029,21 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Desconnectat dels comptes:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Compte %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>La sincronitzaci? del compte est? inhabilitada</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5940,11 +6052,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>Carpeta &local</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation type="unfinished"/>
@@ -5980,22 +6087,11 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Trieu qu? voleu sincronitzar</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation type="unfinished"/>
@@ -6010,6 +6106,22 @@
<source>Erase local folder and start a clean sync</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Trieu qu? voleu sincronitzar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>Carpeta &local</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6050,6 +6162,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>En el futur</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>Ara</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Fa una estona</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6090,57 +6247,12 @@
<source>Synced %1</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>En el futur</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>Ara</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Fa una estona</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6386,6 +6498,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6575,16 +6730,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6599,6 +6744,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6832,16 +6987,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>S'est? preparant la sincronitzaci?</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>S'est? preparant la sincronitzaci?</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>La sincronitzaci? est? en pausa</translation>
@@ -6900,4 +7055,17 @@
<translation>Allibera espai local</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_cs.ts nextcloud-desktop-3.16.6/translations/client_cs.ts
--- nextcloud-desktop-3.16.4/translations/client_cs.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_cs.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>Zapnout rychlou synchronizaci</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>Rychl? synchronizace synchronizuje pouze zm?ny v souborech a slo?k?ch v r?mci slo?ek, kter? byly prozkoum?ny. To m??e v?znamn? zlep?it odezvu p?i po??te?n?m nastaven? virtu?ln?ch soubor?. Nicm?n? to zp?sob? nadbyte?n? stahov?n? soubor? p?esunut?ch do neprozkouman? slo?ky.</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>Zapnout virtu?ln? soubory</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation>Umo?nit maz?n? polo?ek v Ko?i</translation>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -557,7 +549,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Import z d??v?j??ho</translation>
</message>
@@ -572,7 +564,7 @@
<translation>P?esko?it</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>Nepoda?ilo se naimportovat ??ty z nastaven? p?vodn?ho klienta.</translation>
</message>
@@ -580,33 +572,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Prostor ?lo?i?t?: ?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Neza?krtnut? slo?ky budou <b>odstran?ny</b> z m?stn?ho souborov?ho syst?mu a nad?le u? nebudou na tento po??ta? synchronizov?ny</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Storno</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Pou??t</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>P?ipojeni k <server> jako <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Synchronizovat v?e</translation>
@@ -637,6 +607,33 @@
<translation>Nastaven? spojen?</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Pou??t</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Prostor ?lo?i?t?: ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Storno</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>P?ipojeni k <server> jako <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Nenastaven ??dn? ??et.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>?ifrov?n? mezi koncov?mi body u virtu?ln?ch soubor?</translation>
@@ -671,9 +668,9 @@
<b>Tento proces nen? vratn?. Opravdu chcete pokra?ovat?</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Nenastaven ??dn? ??et.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation>Zapomenout nastaven? ?ifrov?n?</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -686,6 +683,11 @@
<translation>Zobrazit mnemotechnickou fr?zi</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation>?ifrov?n? je nastaven?. Nezapome?te <b>za?ifrovat</b> pro ?ifrov?n? mezi koncov?mi body jak?koli nov? soubory do n? p?idan?.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>?ifrov?n? mezi koncov?mi body bylo pro tento ??et zapnuto</translation>
@@ -711,6 +713,13 @@
<translation>Vyskytla se chyba p?i synchronizaci slo?ky. Jej? ?ifrov?n? bude mo?n? a? po ?sp??n? synchronizaci</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation>Tuto slo?ku nen? mo?n? za?ifrovat, proto?e ?ifrov?n? mezi koncov?mi body nen? je?t? na tomto za??zen? nastaveno.
+Chcete tak u?init nyn??</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -735,12 +744,6 @@
<translation>Slo?ku nen? mo?n? za?ifrovat, proto?e u? neexistuje</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Otev??t slo?ku</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>??frovat</translation>
@@ -779,16 +782,6 @@
<translation>Restartovat synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Pokra?ovat v synchronizaci</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Pozastavit synchronizaci</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Odstranit p?ipojen? synchronizace slo?ky</translation>
@@ -814,21 +807,11 @@
<translation>Vytvo?en? slo?ky se nezda?ilo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Neda?? se vytvo?it m?stn? slo?ku <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Potvrdit odstran?n? p?ipojen? synchronizace slo?ky</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Opravdu chcete zastavit synchronizaci slo?ky <i>%1</i>?</p><p><b>Pozn?mka:</b> Toto <b>neodstran?</b> ??dn? soubory.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Odstranit p?ipojen? synchronizace slo?ky</translation>
@@ -862,24 +845,24 @@
<translation>Mnemotechnick? fr?ze pro ?ifrov?n? mezi koncov?mi body</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>Pro ochranu va?? kryptografick? identity ji ?ifrujeme pomoc? mnemotechnick? fr?ze, tvo?en? 12 slovy ze slovn?ku. Poznamenejte si ji n?kam bezpe?n?. Bude pot?ebn? pro p?id?n? dal??ch za??zen? k va?emu ??tu (jako je mobiln? telefon ?i notebook).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation>Pro ochranu va?? kryptografick? identity ji ?ifrujeme pomoc? mnemotechnick? fr?ze, tvo?en? 12 slovy ze slovn?ku. Poznamenejte si ji n?kam bezpe?n?. Bude pot?ebn? pro nastaven? synchronizace ?ifrovan?ch slo?ek s va?imi dal??mi za??zen?mi.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>Vypnout ?ifrov?n? mezi koncov?mi body</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation>Zapomenout na tomto za??zen? ?ifrov?n? mezi koncov?mi body</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>Vypnout ?ifrov?n? mezi koncov?mi body pro %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation>Chcete zapomenout nastaven? ?ifrov?n? mezi koncov?mi body pro %1 na tomto za??zen??</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>Odebr?n? ?ifrov?n? mezi koncov?mi body odebere lok?ln? synchronizovan? soubory, kter? jsou ?ifrovan?.<br>Za?ifrovan? soubory z?stanou na serveru.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation>Zapomenut? ?ifrov?n? mezi koncov?mi body odebere citliv? data a ve?ker? ?ifrovan? soubory z tohoto za??zen?.<br>Nicm?n?, ?ifrovan? soubory z?stanou na serveru a v?ech ostatn?ch za??zen?ch, pokud jsou takov? nastavena.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -892,34 +875,44 @@
<translation>Pr?v? prob?h? operace synchronizace.<br/>P?ejete si ji ukon?it?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>Vyu?ito %1 (%3%) z %2. N?kter? slo?ky, v?etn? t?ch p?ipojen?ch ze s?t? nebo sd?len?ch, mohou m?t odli?n? limity.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 vyu?ito</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>Vyu?ito %1 z %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>P?est?hovat certifik?t na nov?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>V tuto chv?li nejsou k dispozici ??dn? informace o vyu?it? ?lo?i?t?.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>Jsou zde slo?ky, jejich? velikost p?es?hla %1MB: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 vyu?ito</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation>?ifrov?n? mezi koncov?mi body pro tento ??et bylo inicializov?no z jin?ho za??zen?.<br>Zadejte neopakuj?c? se mnemotechnickou abyste m?li ?ifrovan? slo?ky synchronizovan? i na tomto za??zen?.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 jako %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>?ifrov?n? mezi koncov?mi body pro tento ??et bylo zapnut? z jin?ho za??zen?.<br>Na st?vaj?c?m za??zen? je mo?n? ho zapnout zad?n?m va?? mnemotechnick?.<br>Toto zapne synchronizaci existuj?c?ch ?ifrovan?ch slo?ek.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>Verze serveru %1 nen? podporov?na! Pokra?ujte jen na vlastn? nebezpe??.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation>Tento ??et podporuje ?ifrov?n? mezi koncov?mi body, ale je t?eba ho nejprve nastavit.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Nastavit ?ifrov?n?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Tento ??et podporuje ?ifrov?n? mezi koncov?mi body</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -937,79 +930,125 @@
<translation>Na serveru %1 v tuto chv?li prob?h? ?dr?ba.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>Server %1 je v tuto chv?li p?esm?rov?v?n, nebo se va?e p?ipojen? nach?z? za zachycuj?c?m (captive) port?lem.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Odhl??eno z %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>P?ipojov?n? k %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Tyto slo?ky nebyly synchronizov?ny, proto?e jsou p??li? velk?:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>Neda?? se p?ipojit k %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Tyto slo?ky nebyly synchronizov?ny, proto?e se nach?zej? na extern?ch ?lo?i?t?ch:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Chyba nastaven? serveru: %1 na %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Tyto slo?ky nebyly synchronizov?ny, proto?e jsou p??li? velk?, nebo se nach?zej? na extern?ch ?lo?i?t?ch:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>Je t?eba p?ijmout v?eobecn? podm?nky u %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Otev??t slo?ku</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Nenastaveno ??dn? p?ipojen? k %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Pokra?ovat v synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>P?est?hovat certifik?t na nov?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Pozastavit synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Tyto slo?ky nebyly synchronizov?ny, proto?e jsou p??li? velk?:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Neda?? se vytvo?it m?stn? slo?ku <i>%1</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Tyto slo?ky nebyly synchronizov?ny, proto?e se nach?zej? na extern?ch ?lo?i?t?ch:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Opravdu chcete zastavit synchronizaci slo?ky <i>%1</i>?</p><p><b>Pozn?mka:</b> Toto <b>neodstran?</b> ??dn? soubory.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Tyto slo?ky nebyly synchronizov?ny, proto?e jsou p??li? velk?, nebo se nach?zej? na extern?ch ?lo?i?t?ch:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>Pro ochranu va?? kryptografick? identity ji ?ifrujeme pomoc? mnemotechnick? fr?ze, tvo?en? 12 slovy ze slovn?ku. Poznamenejte si ji n?kam bezpe?n?. Bude pot?ebn? pro p?id?n? dal??ch za??zen? k va?emu ??tu (jako je mobiln? telefon ?i notebook).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>Jsou zde slo?ky, jejich? velikost p?es?hla %1MB: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>Vypnout ?ifrov?n? mezi koncov?mi body</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>?ifrov?n? mezi koncov?mi body pro tento ??et bylo zapnut? z jin?ho za??zen?.<br>Na st?vaj?c?m za??zen? je mo?n? ho zapnout zad?n?m va?? mnemotechnick?.<br>Toto zapne synchronizaci existuj?c?ch ?ifrovan?ch slo?ek.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>Vypnout ?ifrov?n? mezi koncov?mi body pro %1?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Tento ??et podporuje ?ifrov?n? mezi koncov?mi body</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>Odebr?n? ?ifrov?n? mezi koncov?mi body odebere lok?ln? synchronizovan? soubory, kter? jsou ?ifrovan?.<br>Za?ifrovan? soubory z?stanou na serveru.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Nastavit ?ifrov?n?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>Vyu?ito %1 (%3%) z %2. N?kter? slo?ky, v?etn? t?ch p?ipojen?ch ze s?t? nebo sd?len?ch, mohou m?t odli?n? limity.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>Vyu?ito %1 z %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>V tuto chv?li nejsou k dispozici ??dn? informace o vyu?it? ?lo?i?t?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 jako %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>Verze serveru %1 nen? podporov?na! Pokra?ujte jen na vlastn? nebezpe??.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>Server %1 je v tuto chv?li p?esm?rov?v?n, nebo se va?e p?ipojen? nach?z? za zachycuj?c?m (captive) port?lem.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>P?ipojov?n? k %1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>Neda?? se p?ipojit k %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Chyba nastaven? serveru: %1 na %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>Je t?eba p?ijmout v?eobecn? podm?nky u %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Nenastaveno ??dn? p?ipojen? k %1.</translation>
</message>
</context>
<context>
@@ -1124,11 +1163,6 @@
<translation>Certifik?t a kl?? (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Proch?zet?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Heslo k certifik?tu:</translation>
@@ -1139,6 +1173,11 @@
<translation>Je d?razn? doporu?eno pou??t za?ifrovan? pkcs12 v?e pohromad?, proto?e kopie bude ulo?ena p??mo v souboru s nastaven?mi.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Proch?zet?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Vybrat certifik?t</translation>
@@ -1189,34 +1228,34 @@
<translation>Pokra?ovat</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 ??t?</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 ??et</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 slo?ek</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 slo?ka</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Import ze star?ho</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1224,12 +1263,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Chyba p?i p??stupu k souboru s nastaven?mi</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>Do?lo k chyb? p?i p??stupu k souboru s nastaven?mi %1. Ov??te, ?e v?? ??et na syst?mu m? k souboru p??stup.</translation>
</message>
@@ -1271,6 +1310,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation>Soubor byl od prvn?ho nalezen? zm?n?n</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation>Nezda?ilo se smazat z?znam souboru %1 z m?stn? datab?ze</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation>Soubor %1 nem??e b?t sta?en, proto?e nen? virtu?ln?!</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation>Nepoda?ilo se z?skat soubor %1 z lok?ln? datab?ze</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation>Soubor %1 nem??e b?t sta?en, proto?e chyb? informace o ?ifrov?n?.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation>Chyba p?i aktualizaci metadat: %1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation>Soubor %1 je pr?v? vyu??v?n</translation>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1278,6 +1356,11 @@
<translation>Soubor %1 nelze nahr?t, proto?e existuje jin? soubor se stejn?m n?zvem, li??c? se pouze velikost? p?smen</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation>N?zev souboru obsahuje mezery na za??tku nebo na konci a nen? mo?n? ho p?ejmenovat</translation>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Soubor %1 nem? platn? ?as zm?ny. Nenahr?vat na server.</translation>
@@ -1482,7 +1565,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Chyba z?pisu metadat do datab?ze</translation>
</message>
@@ -1612,21 +1695,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Opravdu chcete slo?ku <i>%1</i> a ve?ker? jej? obsah natrvalo smazat?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Opravdu chcete soubor <i>%1</i> natrvalo smazat?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Potvrdit smaz?n?</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1642,30 +1710,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Nen? nastaven? ??dn? Nextcloud ??et</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Opravdu chcete slo?ku <i>%1</i> a ve?ker? jej? obsah natrvalo smazat?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Chyba ov??en? se: U?ivatelsk? jm?no nebo heslo nen? spr?vn?.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Opravdu chcete soubor <i>%1</i> natrvalo smazat?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Potvrdit smaz?n?</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>?asov? limit</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Poskytnut? p?ihla?ovac? ?daje nejsou spr?vn?</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>Nastaven? server je v??i tomuto klientovi p??li? star? verze</translation>
@@ -1675,16 +1743,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Aktualizujte server na nejnov?j?? verzi a pak klienta restartujte.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Chyba ov??en? se: U?ivatelsk? jm?no nebo heslo nen? spr?vn?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Nen? nastaven? ??dn? Nextcloud ??et</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Poskytnut? p?ihla?ovac? ?daje nejsou spr?vn?</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Chyba p?i ru?en? maz?n? souboru</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>Chyba p?i ru?en? maz?n? %1</translation>
</message>
@@ -1692,19 +1775,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Chyba serveru: odpov?? PROPFIND nen? ve form?tu XML!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>Chyba nastaven? ?ifrovan?ch metadat!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>Chyba nastaven? ?ifrovan?ch metadat: po??te?n? signatura ze serveru je pr?zdn?.</translation>
</message>
@@ -1712,27 +1795,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Chyba p?i otev?r?n? adres??e %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Adres?? nen? na klientovi p??stupn? ? opr?vn?n? odep?eno</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Adres?? nenalezen: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>Znakov? sada n?zvu souboru nen? platn?</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Chyba p?i na??t?n? adres??e %1</translation>
</message>
@@ -1972,11 +2055,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>URL adresa, na kterou se pravideln? dotazovat, neza??n? na HTTPS, a?koli p?ihla?ovac? adresa na HTTPS za??n?. P?ihl??en? nebude umo?n?no, proto?e by se jednalo a bezpe?nostn? probl?m. Obra?te se na sv?ho spr?vce.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>URL adresa serveru, kter? byla vr?cena, neza??n? na HTTPS, a?koli p?ihla?ovac? adresa na HTTPS za??n?. P?ihl??en? nebude umo?n?no, proto?e by se jednalo a bezpe?nostn? probl?m. Obra?te se na sv?ho spr?vce.</translation>
@@ -1988,28 +2066,33 @@
<translation>Chyba vr?cen? ze serveru: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>URL adresa, na kterou se pravideln? dotazovat, neza??n? na HTTPS, a?koli p?ihla?ovac? adresa na HTTPS za??n?. P?ihl??en? nebude umo?n?no, proto?e by se jednalo a bezpe?nostn? probl?m. Obra?te se na sv?ho spr?vce.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Do?lo k chyb? p?i p??stupu ke koncov?mu bodu ?token?: <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Neda?? se zpracovat JSON vr?cen? serverem: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>Odpov?? ze serveru neobsahuje v?echny o?ek?van? kolonky</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation>Odpov?? ze serveru neobsahovala v?echny o?ek?van? kolonky: <br><em>%1</em></translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Neda?? se zpracovat JSON vr?cen? serverem: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2052,6 +2135,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 byl odebr?n.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 byl aktualizov?n.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 byl p?ejmenov?n na %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 byl p?esunut do %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation><numerusform>%1 a %n dal?? soubor byl smaz?n.</numerusform><numerusform>%1 a %n dal?? soubory byly smaz?ny.</numerusform><numerusform>%1 a %n dal??ch soubor? bylo smaz?no.</numerusform><numerusform>%1 a %n dal?? soubory byly smaz?ny.</numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>Zvolte jin? um?st?n?. Slo?ka %1 neexistuje.</translation>
@@ -2067,20 +2178,9 @@
<translation>Zvolte jin? um?st?n?. %1 nen? ?itelnou slo?kou.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 a %n dal?? soubor bude smaz?n.</numerusform><numerusform>%1 a %n dal?? soubory budou smaz?ny.</numerusform><numerusform>%1 a %n dal??ch soubor? bude smaz?no.</numerusform><numerusform>%1 a %n dal?? soubory budou smaz?ny.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 byl odebr?n.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
- <translation><numerusform>%1 byl p?id?n.</numerusform><numerusform>%1 a %n dal?? soubory byly p?id?ny.</numerusform><numerusform>%1 a %n dal??ch soubor? bylo p?id?no.</numerusform><numerusform>%1 a %n dal?? soubory byly p?id?ny.</numerusform></translation>
+ <translation><numerusform>%1 a %n dal?? soubor byl p?id?n.</numerusform><numerusform>%1 a %n dal?? soubory byly p?id?ny.</numerusform><numerusform>%1 a %n dal??ch soubor? bylo p?id?no.</numerusform><numerusform>%1 a %n dal?? soubory byly p?id?ny.</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="459"/>
@@ -2093,33 +2193,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 a %n dal?? soubor byl aktualizov?n.</numerusform><numerusform>%1 a %n dal?? soubory byly aktualizov?ny.</numerusform><numerusform>%1 a %n dal??ch soubor? bylo aktualizov?no.</numerusform><numerusform>%1 a %n dal?? soubory byly aktualizov?ny.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 byl aktualizov?n.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 byl p?ejmenov?n na %2 a %n dal?? soubor byl p?ejmenov?n</numerusform><numerusform>%1 byl p?ejmenov?n na %2 a %n dal?? soubory byly p?ejmenov?ny.</numerusform><numerusform>%1 byl p?ejmenov?n na %2 a %n dal??ch soubor? bylo p?ejmenov?no.</numerusform><numerusform>%1 byl p?ejmenov?n na %2 a %n dal?? soubory byly p?ejmenov?ny.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 byl p?ejmenov?n na %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 byl p?esunut do %2 a %n dal?? soubor byl p?esunut.</numerusform><numerusform>%1 byl p?esunut do %2 a %n dal?? soubory byly p?esunuty.</numerusform><numerusform>%1 byl p?esunut do %2 a %n dal??ch soubor? bylo p?esunuto.</numerusform><numerusform>%1 byl p?esunut do %2 a %n dal?? soubory byly p?esunuty.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 byl p?esunut do %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2156,67 +2239,67 @@
<translation>Pr?b?h synchronizace</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Nezda?ilo se p?e?ten? syst?mov?ho souboru s polo?kami pro vynech?n?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Byla p?id?na nov? slo?ka v?t?? ne? %1 MB: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Byla p?id?na slo?ka z extern?ho ?lo?i?t?.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Pokud to chcete st?hnout, jd?te do nastaven? a vyberte to.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>Slo?ka p?ekro?ila nastaven? limit velikosti %1MB: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>Synchronizovat</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>Zastavit synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>Slo?ka %1 p?ekro?ila nastaven? limit velikosti %2MB.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>Chcete ji p?estat synchronizovat?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Slo?ka %1 byla vytvo?ena ale byla u? d??ve vynech?na ze synchronizace. Data, kter? se v n? nach?zej?, nebudou synchronizov?na.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Soubor %1 byl vytvo?en ale byl u? d??ve vynech?n ze synchronizace. Nebude synchronizov?n.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2229,12 +2312,12 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>Sta?en? virtu?ln?ho souboru se nezda?ilo s k?dem ?%1?, stav ?%2? a chybov? hl??en? ?%3?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2243,7 +2326,7 @@
P??padn? je mo?n? ve?ker? smazan? soubory obnovit jejich nahr?n?m ze slo?ky ?%1? na server.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2252,22 +2335,22 @@
P??padn? je mo?n? ve?ker? smazan? soubory obnovit jejich sta?en?m si ze serveru.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>Odebrat ve?ker? soubory?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>Pokra?ovat v maz?n?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>Obnovit soubory na server</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>Obnovit soubory ze serveru</translation>
</message>
@@ -2308,11 +2391,6 @@
<translation>Neda?? se obnovit stav slo?ky</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>Byl nalezen star? z?znam synchronizace ?%1?, ale nebylo mo?n? ho odebrat. Ujist?te se, ?e nen? aktu?ln? pou??v?n jinou aplikac?.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation> (z?loha)</translation>
@@ -2323,6 +2401,11 @@
<translation> (z?loha %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>Byl nalezen star? z?znam synchronizace ?%1?, ale nebylo mo?n? ho odebrat. Ujist?te se, ?e nen? aktu?ln? pou??v?n jinou aplikac?.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Nedefinovan? stav.</translation>
@@ -2393,16 +2476,6 @@
<translation>Po?adavek na synchronizaci zru?en.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Synchronizace je pozastavena.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (synchronizace je pozastavena)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>Zvolte jin? um?st?n?. Vybran? slo?ka nen? platn?.</translation>
@@ -2452,6 +2525,16 @@
?e?en? tohoto probl?mu: odeberte %1 z jednoho z ??t? a vytvo?te novou synchroniza?n? slo?ku.
Pro pokro?il? u?ivatele: tento probl?m m??e souviset s v?cero datab?zov?mi soubory synchronizace, nalezen?mi v jedn? slo?ce. Zkontrolujte %1 ohledn? zastaral?ch a nepou??van?ch soubor? .sync_*.db a odeberte je.</translation>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Synchronizace je pozastavena.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (synchronizace je pozastavena)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2495,16 +2578,6 @@
<translation>Chyba p?i na??t?n? seznamu slo?ek ze serveru.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Na??t?n? seznamu slo?ek ze serveru?</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Jsou zde nevy?e?en? konflikty. Podrobnosti si zobraz?te kliknut?m.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>Podpora pro virtu?ln? soubory zapnuta.</translation>
@@ -2546,16 +2619,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>Stahov?n? %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>Soubor %1 z %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Jsou zde nevy?e?en? konflikty. Podrobnosti si zobraz?te kliknut?m.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>Stahov?n? %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Na??t?n? seznamu slo?ek ze serveru?</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2602,21 +2690,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 z %2, soubor %3 z %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>Soubor %1 z %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>?ek? se na %n dal?? slo?ku?</numerusform><numerusform>?ek? se na %n dal?? slo?ky?</numerusform><numerusform>?ek? se na %n dal??ch slo?ek?</numerusform><numerusform>?ek? se na %n dal?? slo?ky?</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>Chyst? se zah?jen? synchronizace</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>?ek? se na %n dal?? slo?ku?</numerusform><numerusform>?ek? se na %n dal?? slo?ky?</numerusform><numerusform>?ek? se na %n dal??ch slo?ek?</numerusform><numerusform>?ek? se na %n dal?? slo?ky?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2776,11 +2859,6 @@
<translation>Obecn? nastaven?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Spustit p?i startu syst?mu</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>Zobrazovat upozorn?n? na hovory</translation>
@@ -2791,11 +2869,6 @@
<translation>Pro oznamovac? oblast syst?mov?ho panelu</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Pou??vat ?er&nob?l? ikony</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>Zobrazovat notifikace ohledn? chatu</translation>
@@ -2811,17 +2884,32 @@
<translation>Pokro?il?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Zeptat se p?ed synchronizac? nov?ch slo?ek v?t??ch ne?</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Zeptat se p?ed synchronizac? extern?ch ?lo?i??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Spustit p?i startu syst?mu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Pou??vat ?er&nob?l? ikony</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Zeptat se p?ed synchronizac? nov?ch slo?ek v?t??ch ne?</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>Upozornit pokud se synchronizovan? slo?ky stanou v?t??mi ne? nastaven? limit</translation>
@@ -2832,11 +2920,6 @@
<translation>Automaticky vypnout synchronizaci slo?ek, kter? p?es?hnou limit</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Zeptat se p?ed synchronizac? extern?ch ?lo?i??</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>P?esouvat odebran? soubory do ko?e</translation>
@@ -2888,11 +2971,6 @@
<translation>Kan?l aktualizac?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Restartovat a aktualizovat</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>&Automaticky zji??ovat dostupnost aktualizac?</translation>
@@ -2913,6 +2991,16 @@
<translation>Pr?vn? upozorn?n?</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation>Vr?tit na &v?choz?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Restartovat a aktualizovat</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Upozorn?n? ze serveru, kter? vy?aduj? pozornost.</translation>
@@ -2933,6 +3021,11 @@
<translation>Automatick? spou?t?n? nem??ete vypnout, proto?e je celosyst?mov? zapnut? pro v?echny u?ivatele.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation>Obnovit do &%1</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>stabiln?</translation>
@@ -3014,6 +3107,11 @@
<source>Debug archive is created at %1</source>
<translation>Archiv s ladic?mi informacemi je vytvo?en v %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation>Ne? nasd?l?te, odstra?te v?echny pro v?s citliv? informace! Archiv s lad?c?mi informacemi vytvo?en v %1</translation>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3178,102 +3276,97 @@
<translation>Nov? n?zev souboru</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>P?ejmenovat soubor</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>Soubor ?%1? nemohl b?t synchronizov?n, proto?e jeho n?zev obsahuje znaky, kter? nejsou na tomto syst?mu povoleny.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>N?sleduj?c? znaky nejsou syst?mem dovoleny: * " | & ? , ; : \ / ~ < > ?vodn? a navazuj?c? mezery</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation>N?sleduj?c? znaky nejsou syst?mem dovoleny: \ / : ? * " < > | ?vodn? a navazuj?c? mezery</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>Soubor ?%1? nemohl b?t synchronizov?n, proto?e jeho n?zev obsahuje znaky, kter? nejsou na serveru povoleny.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>N?sleduj?c? znaky nejsou povolen?: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>N?sleduj?c? z?kladn? n?zvy nejsou povolen?: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>N?sleduj?c? n?zvy soubor? nejsou povolen?: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>N?sleduj?c? p??pony soubor? nejsou povolen?: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Kontrola opr?vn?n? k p?ejmenov?v?n??</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>Nem?te pot?ebn? pr?va k p?ejmenov?n? souboru. Po??dejte vlastn?ka souboru, aby ho p?ejmenoval.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>Nepoda?ilo se z?skat opr?vn?n? kv?li chyb? %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>N?zev souboru za??n? a kon?? mezerami.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>N?zev souboru za??n? na mezery.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>N?zev souboru kon?? na mezery.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>Pou??t neplatn? jm?no</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>N?zev souboru obsahuje neplatn? znaky: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>P?ejmenovat soubor se nepoda?ilo. Ujist?te se, ?e jste p?ipojen? k serveru.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>Soubor nen? mo?n? p?ejmenovat, proto?e soubor se stejn?m n?zvem na serveru u? existuje. Vyberte jin? n?zev.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>Neda?? se p?ejmenovat m?stn? soubor. %1</translation>
</message>
@@ -3397,16 +3490,6 @@
<translation><p>Je k dispozici nov? verze klienta %1.</p><p><b>%2</b> je k dispozici ke sta?en?. Moment?ln? je nainstalov?na verze %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Tentokr?t p?esko?it</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Z?skat aktualizaci</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>Aktualizace se nezda?ila</translation>
@@ -3431,6 +3514,16 @@
<source>Update manually</source>
<translation>Aktualizovat ru?n?</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Tentokr?t p?esko?it</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Z?skat aktualizaci</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3455,6 +3548,23 @@
<translation>Proxy server vy?aduje p?ihl??en?</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Rychlost stahov?n?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Omezit na</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBajt?/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>Pozn?mka: nastaven? proxy nem? ??dn? vliv na ??ty na pr?v? pou??van?m po??ta?i</translation>
@@ -3477,46 +3587,29 @@
<translation>Pou??t glob?ln? nastaven?</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Rychlost stahov?n?</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Bez omezen?</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBajt?/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Omezit na</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Omezit na 3/4 odhadovan? rychlosti</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Rychlost odes?l?n?</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Omezovat automaticky</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Rychlost odes?l?n?</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>N?zev stroje s proxy serverem</translation>
@@ -3545,6 +3638,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>Neda?? se zjistit dostupnost p??padn?ch nov?ch aktualizac?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Kontroluje se aktualiza?n? server?</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>Je p?ipravena nov? aktualizace %1</translation>
@@ -3575,11 +3678,6 @@
<translation>Aktualizaci se neda?? st?hnout. Otev?ete %1 a st?hn?te si aktualizaci ru?n?.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>Neda?? se zjistit dostupnost p??padn?ch nov?ch aktualizac?.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>Je k dispozici nov? %1. Kliknut?m na <a href='%2'>%2</a> si st?hnete aktualizaci.</translation>
@@ -3590,16 +3688,21 @@
<translation>Je k dispozici nov? %1. Aktualizaci si st?hnete otev?en?m %2.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Kontroluje se aktualiza?n? server?</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Stav aktualizace je nezn?m?: Nov? aktualizace nebyly zkontrolov?ny.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation>Vyu??v?te aktualiza?n? kan?l %1. Va?e instalace vyu??v? nejnov?j?? verzi.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation>Nejsou k dispozici ??dn? nov? aktualizace. Va?e instalace je provozov?na na nejnov?j?? verzi.</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Nejsou k dispozici ??dn? aktualizace. Pou??v?te nejnov?j?? verzi.</translation>
@@ -3775,11 +3878,6 @@
<translation><font color="green">?sp??n? p?ipojeno k %1: %2 verze %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>Neplatn? URL adresa</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Nepoda?ilo se spojit s %1 v %2:<br/>%3</translation>
@@ -3790,6 +3888,16 @@
<translation>P?ekro?en ?asov? limit p?i pokusu o p?ipojen? k %1 na %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>P??stup zam?tnut serverem. Pro ov??en? spr?vn?ch p??stupov?ch pr?v <a href="%1">klikn?te sem</a> a otev?ete slu?bu ve sv?m prohl??e?i.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>Neplatn? URL adresa</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Pokus o p?ipojen? k %1 na %2?</translation>
@@ -3800,11 +3908,6 @@
<translation>Po?adavek na ov??en? byl p?esm?rov?n na ?%1?. URL je chybn?, server nen? spr?vn? nastaven.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>P??stup zam?tnut serverem. Pro ov??en? spr?vn?ch p??stupov?ch pr?v <a href="%1">klikn?te sem</a> a otev?ete slu?bu ve sv?m prohl??e?i.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>P?i?la neplatn? odpov?? na WebDAV po?adavek s ov??en?m se</translation>
@@ -4016,62 +4119,34 @@
<translation>Na tomto souborov?m syst?mu nejsou podporov?ny n?zvy soubor? kon??c? na te?ku.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Slo?ka</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Soubor</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation>N?zvy slo?ek obsahuj?c? znak ?%1? nejsou na tomto souborov?m syst?mu podporov?ny.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>N?zev %1 obsahuj?c? znak ?%2? nen? na tomto souborov?m syst?mu podporov?n.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation>N?zvy soubor? obsahuj?c? znak ?%1? nejsou na tomto souborov?m syst?mu podporov?ny.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>N?zev %1 obsahuje p?inejmen??m jeden neplatn? znak</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation>N?zev slo?ky obsahuje p?inejmen??m jeden neplatn? znak</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>N?zev %S je na tomto souborov?m syst?mu rezervovan?m n?zvem (nelze ho pou??t).</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>N?zev souboru obsahuje p?inejmen??m jeden neplatn? znak</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation>N?zev slo?ky je na tomto souborov?m syst?mu rezervovan?m n?zvem (nelze ho pou??t).</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation>N?zev souboru je na tomto souborov?m syst?mu rezervovan?m n?zvem (nelze ho pou??t).</translation>
</message>
@@ -4081,6 +4156,24 @@
<translation>N?zev souboru kon?? na mezery.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Slo?ka</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Soubor</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>N?zev %1 obsahuj?c? znak ?%2? nen? na tomto souborov?m syst?mu podporov?n.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4089,6 +4182,16 @@
<translation>Nen? mo?n? p?ejmenovat nebo nahr?t.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>N?zev %1 obsahuje p?inejmen??m jeden neplatn? znak</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>N?zev %S je na tomto souborov?m syst?mu rezervovan?m n?zvem (nelze ho pou??t).</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>N?zev souboru za??n? na mezery.</translation>
@@ -4179,64 +4282,74 @@
<translation>Server nahl??en ??slo %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Nen? mo?n? prov?st synchronizaci z d?vodu neplatn?ho ?asu zm?ny</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation>Nahr?n? %1 p?ekra?uje %2 zb?vaj?c?ho prostoru v osobn?ch souborech.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation>Nahr?n? %1 p?ekra?uje %2 zb?vaj?c?ho prostoru ve slo?ce %3. </translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>Nepoda?ilo se nahr?t soubor, proto?e je otev?en? v ?%1?.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>Chyba p?i maz?n? z?znamu o souboru %1 z datab?ze</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>P?esunuto do neplatn?ho c?le ? obnovuje se</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>Nen? mo?n? upravit ?ifrovanou polo?ku, proto?e vybran? certifik?t nen? platn?.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorov?no podle nastaven? ?vybrat co synchronizovat?</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Neumo?n?no, proto?e nem?te opr?vn?n? p?id?vat podslo?ky do t?to slo?ky</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Neumo?n?no, proto?e nem?te opr?vn?n? p?id?vat soubory do t?to slo?ky</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Nen? mo?n? tento soubor nahr?t, proto?e je na serveru povoleno pouze ?ten? ? obnovuje se</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>Odstran?n? nen? umo?n?no ? obnovuje se</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Chyba p?i ?ten? datab?ze</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>Server vr?til chybu p?i ?ten? adres??e ?%1?: %2</translation>
</message>
@@ -4244,38 +4357,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>Nepoda?ilo se smazat soubor %1 lok?ln? datab?ze</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>Chyba p?i aktualizaci metadat z d?vodu neplatn?ho ?asu zm?ny</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>Slo?ka %1 nem??e b?t u?in?na pouze pro ?ten?: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>nezn?m? v?jimka</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Chyba p?i aktualizov?n? metadat: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>Soubor je v tuto chv?li pou??v?n jinou aplikac?</translation>
</message>
@@ -4293,12 +4406,6 @@
<translation>Soubor %1 nen? mo?n? st?hnout z d?vodu chyb?j?c?ch informac? o ?ifrov?n?</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>Soubor se mezit?m zm?nil</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4355,6 +4462,12 @@
<source>The file %1 is currently in use</source>
<translation>Soubor %1 je v tuto chv?li pou??v?n jinou aplikac?</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>Soubor se mezit?m zm?nil</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4372,39 +4485,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>smaz?n? souboru %1 se nezda?ilo, chyba: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>Slo?ku %1 nen? mo?n? vytvo?it kv?li kolizi stejn?ch n?zv? li??c?ch se jen velikost? p?smen se souborem ?i slo?kou na stroji!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>Nepoda?ilo se vytvo?it slo?ku %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>Slo?ka %1 nem??e b?t u?in?na pouze pro ?ten?: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>nezn?m? v?jimka</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Chyba p?i aktualizov?n? metadat: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>Soubor %1 je v tuto chv?li pou??v?n jinou aplikac?</translation>
</message>
@@ -4417,14 +4530,14 @@
<translation>Nelze odstranit %1 z d?vodu kolize n?zvu s m?stn?m souborem</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation>Do?asn? chyba p?i odeb?r?n? lok?ln? polo?ky odebran? ze serveru.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Nepoda?ilo se smazat z?znam o souboru %1 z lok?ln? datab?ze</translation>
</message>
@@ -4432,49 +4545,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>Slo?ku %1 nen? mo?n? p?ejmenovat kv?li kolizi stejn?ch n?zv? li??c?ch se jen velikost? p?smen se souborem ?i slo?kou na stroji!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>Soubor %1 sta?en, ale m?lo za n?sledek kolizi stejn?ch n?zv? li??c?ch se jen velikost? p?smen se souborem na stroji!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>Nepoda?ilo se z?skat soubor %1 z lok?ln? datab?ze</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Chyba p?i nastavov?n? stavu pin</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Chyba p?i aktualizov?n? metadat: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>Soubor %1 je v tuto chv?li pou??v?n jinou aplikac?</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>Nepoda?ilo se zpropagovat p?ejmenov?n? slo?ky v hierarchii</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Nepoda?ilo se p?ejmenovat soubor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Nepoda?ilo se smazat z?znam ohledn? souboru %1 z lok?ln? datab?ze</translation>
</message>
@@ -4531,39 +4644,39 @@
<translation>%1 nen? mo?n? p?ejmenovat na %2, chyba: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Chyba p?i aktualizov?n? metadat: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>Soubor %1 je v tuto chv?li pou??v?n jinou aplikac?</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Serverem vr?cen neplatn? HTTP k?d. O?ek?v?n 201, ale obdr?en ?%1 %2?.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>Nepoda?ilo se z?skat soubor %1 z lok?ln? datab?ze</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Nepoda?ilo se smazat z?znam o souboru %1 z m?stn? datab?ze</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Chyba p?i nastavov?n? stavu pin</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Chyba z?pisu metadat do datab?ze</translation>
</message>
@@ -4571,22 +4684,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>?ifrovan? soubor se nepoda?ilo nahr?t.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>Soubor %1 nelze nahr?t, proto?e existuje jin? soubor se stejn?m n?zvem, li??c? se pouze velikost? p?smen</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>Nahr?n? %1 p?ekra?uje kv?tu nastavenou pro slo?ku</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4594,11 +4696,6 @@
<translation>Soubor %1 nem? platn? ?as zm?ny. Nenahr?vat na server.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Soubor odebr?n (zah?jit nahr?v?n?) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>M?stn? soubor se b?hem synchronizace zm?nil. Bude zopakov?na.</translation>
@@ -4628,6 +4725,22 @@
<source>The file %1 is currently in use</source>
<translation>Soubor %1 je v tuto chv?li pou??v?n jinou aplikac?</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>Nahr?n? %1 p?ekra?uje kv?tu nastavenou pro slo?ku</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>?ifrovan? soubor se nepoda?ilo nahr?t.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Soubor odebr?n (zah?jit nahr?v?n?) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4876,6 +4989,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Sd?len? kontextov? nab?dky</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>N?co jsem v?m nasd?lel(a)</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Mo?nosti sd?len?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Poslat soukrom? odkaz e-mailem?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Zkop?rovat soukrom? odkaz do schr?nky</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>Nepoda?ilo se za?ifrovat slo?ku na ?%1?</translation>
@@ -4910,43 +5049,17 @@
<translation>N?sleduj?c? slo?ka byla ?sp??n? za?ifrov?na: ?%1?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Sd?len? kontextov? nab?dky</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Vyberte nov? um?st?n??</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>N?co jsem v?m nasd?lel(a)</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Mo?nosti sd?len?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Aktivita</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Zkop?rovat soukrom? odkaz do schr?nky</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Poslat soukrom? odkaz e-mailem?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>Opustit toto sd?len?</translation>
@@ -4962,11 +5075,6 @@
<translation>Sd?len? t?to slo?ky d?l dal??m nen? umo?n?no</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Zkop?rovat intern? odkaz</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>Za?ifrovat</translation>
@@ -4993,12 +5101,6 @@
<translation><numerusform>Platnost skon?? za %1 minutu</numerusform><numerusform>Platnost skon?? za %1 minuty</numerusform><numerusform>Platnost skon?? za %1 minut</numerusform><numerusform>Platnost skon?? za %1 minuty</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Otev??t v prohl??e?i</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Vy?e?it konflikt?</translation>
@@ -5028,6 +5130,17 @@
<source>Delete</source>
<translation>Smazat</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Zkop?rovat intern? odkaz</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Otev??t v prohl??e?i</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5129,13 +5242,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Toto spojen? NEN? bezpe?n?, proto?e nen? ?ifrovan?.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Verze serveru: %1</translation>
@@ -5155,6 +5261,13 @@
<source>The connection is not secure</source>
<translation>Spojen? nen? zabezpe?en?</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Toto spojen? NEN? bezpe?n?, proto?e nen? ?ifrovan?.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5247,6 +5360,32 @@
<translation>%1 (p?esko?eno kv?li p?edchoz? chyb?, dal?? pokus za %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Je dostupn?ch pouze %1, pro spu?t?n? je pot?eba alespo? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>Neda?? se otev??t nebo vytvo?it m?stn? synchroniza?n? datab?zi. Ov??te, ?e m?te p??stup k z?pisu do synchroniza?n? slo?ky.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Na disku doch?z? m?sto: Stahov?n? kter? by zmen?ilo voln? m?sto pod %1 bude p?esko?eno.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>Na serveru nen? pro n?kter? z nahr?van?ch soubor? dostatek m?sta.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Nevy?e?en? konflikt.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>Neda?? se aktualizovat soubor: %1</translation>
@@ -5267,22 +5406,6 @@
<translation>Nepoda?ilo se nastavit z?znam ohledn? souboru na lok?ln? datab?zi: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Nevy?e?en? konflikt.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Je dostupn?ch pouze %1, pro spu?t?n? je pot?eba alespo? %2</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>Neda?? se otev??t nebo vytvo?it m?stn? synchroniza?n? datab?zi. Ov??te, ?e m?te p??stup k z?pisu do synchroniza?n? slo?ky.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Pou??vaj? se virtu?ln? soubory s p??ponou, ale p??pona nen? nastavena</translation>
@@ -5302,16 +5425,6 @@
<source>Cannot open the sync journal</source>
<translation>Neda?? se otev??t synchroniza?n? ?urn?l</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Na disku doch?z? m?sto: Stahov?n? kter? by zmen?ilo voln? m?sto pod %1 bude p?esko?eno.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>Na serveru nen? pro n?kter? z nahr?van?ch soubor? dostatek m?sta.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5322,7 +5435,7 @@
<translation>Offline</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>Je t?eba p?ijmout v?eobecn? podm?nky</translation>
</message>
@@ -5706,11 +5819,6 @@
<source>Less than a minute</source>
<translation>M?n? ne? minuty</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation><numerusform>%n minuta</numerusform><numerusform>%n minuty</numerusform><numerusform>%n minut</numerusform><numerusform>%n minuty</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5718,20 +5826,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation><numerusform>%n hodina</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodin</numerusform><numerusform>%n hodiny</numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1 minuta</numerusform><numerusform>%1 minuty</numerusform><numerusform>%1 minut</numerusform><numerusform>%1 minuty</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation><numerusform>%n den</numerusform><numerusform>%n dny</numerusform><numerusform>%n dn?</numerusform><numerusform>%n dny</numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1 hodina</numerusform><numerusform>%1 hodiny</numerusform><numerusform>%1 hodin</numerusform><numerusform>%1 hodiny</numerusform></translation>
@@ -5746,6 +5844,21 @@
<source>%1 days</source>
<translation><numerusform>%1 den</numerusform><numerusform>%1 dny</numerusform><numerusform>%1 dn?</numerusform><numerusform>%1 dny</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation><numerusform>%n minuta</numerusform><numerusform>%n minuty</numerusform><numerusform>%n minut</numerusform><numerusform>%n minuty</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n hodina</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodin</numerusform><numerusform>%n hodiny</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n den</numerusform><numerusform>%n dny</numerusform><numerusform>%n dn?</numerusform><numerusform>%n dny</numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5888,6 +6001,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>P?ihlaste se</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>Nejsou nastaven? ??dn? slo?ky pro synchronizaci.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Odpojeno od %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Nepodporovan? verze serveru</translation>
@@ -5908,31 +6036,6 @@
<translation>V?? %1 ??et vy?aduje abyste p?ijali v?eobecn? podm?nky slu?eb serveru, kter? vyu??v?te. Budete p?esm?rov?n? na %2, kde m??ete potvrdit, ?e jste si je p?e?etli a souhlas?te s nimi.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Odpojeno od %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Odpojeno od ??t?:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>??et %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>P?ihlaste se</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Synchronizace ??tu je vypnuta</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5954,11 +6057,6 @@
<translation>macOS VFS pro %1: Narazilo se na probl?m.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>Nejsou nastaven? ??dn? slo?ky pro synchronizaci.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Zji??uj? se zm?ny ve vzd?len?m ?%1?</translation>
@@ -5969,6 +6067,21 @@
<translation>Zji??uj? se zm?ny v m?stn?m ?%1?</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Odpojeno od ??t?:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>??et %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Synchronizace ??tu je vypnuta</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5977,11 +6090,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>M?stn? s&lo?ka</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>U?ivatelsk? jm?no</translation>
@@ -6017,22 +6125,11 @@
<translation>Zeptat se p?ed synchronizac? slo?ek v?t??ch ne?</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Zeptat se p?ed synchronizac? extern?ch ?lo?i??</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Vybrat co synchronizovat</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Ponechat m?stn? data</translation>
@@ -6047,6 +6144,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Vymazat m?stn? slo?ku a za??t synchronizovat</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Vybrat co synchronizovat</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>M?stn? s&lo?ka</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6087,6 +6200,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>v budoucnosti</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1m</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>nyn?</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>P?ed n?jak?m ?asem</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6127,57 +6285,12 @@
<source>Synced %1</source>
<translation>Synchronizov?no %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>v budoucnosti</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>nyn?</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1m</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>P?ed n?jak?m ?asem</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation>Chyba p?i maz?n? souboru</translation>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>Popisy um?st?n? za??naj?c?mi na znak ?#? nejsou ve VFS re?imu podporov?ny.</translation>
@@ -6423,6 +6536,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>Otev??t m?stn? nebo skupinov? slo?ky</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Otev??t m?stn? slo?ku</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>P?ipojeno</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>Odpojeno</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>Otev??t m?stn? slo?ku ?%1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>Otev??t skupinovou slo?ku ?%1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>Otev??t %1 ve spr?vci soubor?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>Nab?dka skupin u?ivatel? a m?stn?ch slo?ek</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6612,16 +6768,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6636,6 +6782,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6869,16 +7025,16 @@
<translation>P?i nastavov?n? do?lo k chyb?</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>P?ipravuje se na synchronizaci</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>Zastavov?n? synchronizace</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>P?ipravuje se na synchronizaci</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Synchronizace pozastavena</translation>
@@ -6937,4 +7093,17 @@
<translation>Uvolnit lok?ln? prostor</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>Zapnout rychlou synchronizaci</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>Rychl? synchronizace synchronizuje pouze zm?ny v souborech a slo?k?ch v r?mci slo?ek, kter? byly prozkoum?ny. To m??e v?znamn? zlep?it odezvu p?i po??te?n?m nastaven? virtu?ln?ch soubor?. Nicm?n? to zp?sob? nadbyte?n? stahov?n? soubor? p?esunut?ch do neprozkouman? slo?ky.</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_da.ts nextcloud-desktop-3.16.6/translations/client_da.ts
--- nextcloud-desktop-3.16.4/translations/client_da.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_da.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>Aktiver for hurtig synk</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>Hurtig synk vil kun synkronisere ?ndringer i filer og mapper i mapper der er blevet gennemset. Dette kan ?ge responsiviteten markant ved den f?rste konfiguration af virtuelle filer. Dog vil det skabe redundante downloads af filer flyttet til en ikke gennemse mappe.</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>Aktiver virtuelle filer</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -558,14 +550,14 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Legacy import</translation>
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="237"/>
<source>Import</source>
- <translation>Importer</translation>
+ <translation>Import?r</translation>
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="238"/>
@@ -573,7 +565,7 @@
<translation>Spring over</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>Kunne ikke importere konti fra ?ldre klientkonfiguration.</translation>
</message>
@@ -581,33 +573,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Lagerplads: ...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Fravalgte mapper vil blive <b>fjernet</b> fra dit lokale filsystem og bliver ikke l?ngere synkroniseret til denne computer</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Annuller</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Anvend</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Forbundet med <server> som <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Synkroniser alt</translation>
@@ -638,6 +608,33 @@
<translation>Forbindelsesindstillinger</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Anvend</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Lagerplads: ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Annuller</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Forbundet med <server> som <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Ingen konto konfigureret.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>End-to-end-kryptering med Virtuelle Filer</translation>
@@ -672,9 +669,9 @@
<b>Denne proces er irreversibel. Er du sikker p? at du ?nsker at forts?tte?</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Ingen konto konfigureret.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -687,6 +684,11 @@
<translation>Vis huskeregel</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>End-to-end-kryptering er blevet aktiveret for denne konto</translation>
@@ -712,6 +714,12 @@
<translation>Mappen har en synkroniseringsfejl. Kryptering af denne mappe vil v?re mulig, n?r den er synkroniseret</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -736,12 +744,6 @@
<translation>Kunne ikke kryptere mappen da den ikke l?ngere eksisterer</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>?bn mappe</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Krypter</translation>
@@ -780,16 +782,6 @@
<translation>Genstart synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Genoptag synkronisering</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>S?t synk. p? pause</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Fjern mappesynkroniseringsforbindelse</translation>
@@ -815,21 +807,11 @@
<translation>Fejl ved oprettelse af mappe</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Kunne ikke oprette lokal mappe <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Bekr?ft Fjern mappesynkroniseringsforbindelse</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>?nsker du virkelig at stoppe synkronisering af mappen <i>%1</i>?</p><p><b>Note:</b>Dette sletter <b>ikke</b>nogen filer.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Fjern mappesynkroniseringsforbindelse</translation>
@@ -863,24 +845,24 @@
<translation>End-to-end kryptering mnemonic</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>For at beskytte din Kryptografiske Identitet krypterer vi den med en mnemonic p? 12 ordbogsord. Noter venligst disse ned og opbevar dem sikkert. De vil v?re n?dvendige for at tilf?je andre enheder til din konto (s?som din mobiltelefon eller b?rbare computer).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>Deaktiver end-til-end-kryptering</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>Deaktiver end-til-end-kryptering for %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>Fjernelse af end-til-end-kryptering vil fjerne lokalt synkroniserede filer, der er krypteret.<br>Krypterede filer forbliver p? serveren.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -893,34 +875,44 @@
<translation>Synkroniseringen er i gang.<br/>?nsker du at afslutte den?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) af %2 i brug. Nogle mapper, inklusiv netv?rksdiske eller delte mapper, har muligvis andre begr?nsninger.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 i brug</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 af %2 er i brug</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>Migrer certifikatet til et nyt</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Der er i ?jeblikket ingen informationer om brug af lager tilg?ngelig.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>Der er mapper som er vokset i st?rrelse ud over %1MB: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 i brug</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 som %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>End-to-end kryptering er blevet aktiveret p? denne konto med et anet apparat.<br>Det kan aktiveres p? dette apparat ved at angive din mnemoniske.<br>Dette vil aktivere synkronisering af eksisterende krypterede mapper.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>Serverversion %1 er ikke supporteret! Forts?t p? egen risiko.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Ops?t kryptering</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Denne konto underst?tter end-to-end kryptering</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -938,79 +930,125 @@
<translation>Serveren %1 er i vedligeholdelsestilstand.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>Server %1 bliver i ?jeblikket omdirigeret, eller din forbindelse er bag en captive-portal.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Logget ud fra %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Forbinder til %1 ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Der er mapper som ikke blev synkroniseret fordi de er for store:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>Kan ikke oprette forbindelse til %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Der er mapper som ikke blev synkroniseret fordi de er eksterne lagre:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Serverkonfigurationsfejl: %1 p? %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Der er mapper som ikke blev synkroniseret fordi de er for store eller eksterne lagre:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>Du skal acceptere servicevilk?rene p? %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>?bn mappe</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Ingen %1 forbindelse konfigureret.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Genoptag synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>Migrer certifikatet til et nyt</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>S?t synk. p? pause</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Der er mapper som ikke blev synkroniseret fordi de er for store:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Kunne ikke oprette lokal mappe <i>%1</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Der er mapper som ikke blev synkroniseret fordi de er eksterne lagre:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>?nsker du virkelig at stoppe synkronisering af mappen <i>%1</i>?</p><p><b>Note:</b>Dette sletter <b>ikke</b>nogen filer.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Der er mapper som ikke blev synkroniseret fordi de er for store eller eksterne lagre:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>For at beskytte din Kryptografiske Identitet krypterer vi den med en mnemonic p? 12 ordbogsord. Noter venligst disse ned og opbevar dem sikkert. De vil v?re n?dvendige for at tilf?je andre enheder til din konto (s?som din mobiltelefon eller b?rbare computer).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>Der er mapper som er vokset i st?rrelse ud over %1MB: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>Deaktiver end-til-end-kryptering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>End-to-end kryptering er blevet aktiveret p? denne konto med et anet apparat.<br>Det kan aktiveres p? dette apparat ved at angive din mnemoniske.<br>Dette vil aktivere synkronisering af eksisterende krypterede mapper.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>Deaktiver end-til-end-kryptering for %1?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Denne konto underst?tter end-to-end kryptering</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>Fjernelse af end-til-end-kryptering vil fjerne lokalt synkroniserede filer, der er krypteret.<br>Krypterede filer forbliver p? serveren.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Ops?t kryptering</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) af %2 i brug. Nogle mapper, inklusiv netv?rksdiske eller delte mapper, har muligvis andre begr?nsninger.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 af %2 er i brug</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Der er i ?jeblikket ingen informationer om brug af lager tilg?ngelig.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 som %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>Serverversion %1 er ikke supporteret! Forts?t p? egen risiko.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>Server %1 bliver i ?jeblikket omdirigeret, eller din forbindelse er bag en captive-portal.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Forbinder til %1 ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>Kan ikke oprette forbindelse til %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Serverkonfigurationsfejl: %1 p? %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>Du skal acceptere servicevilk?rene p? %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Ingen %1 forbindelse konfigureret.</translation>
</message>
</context>
<context>
@@ -1125,11 +1163,6 @@
<translation>Certifikat og n?gle (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Browse ...</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Certifikat kodeord :</translation>
@@ -1140,6 +1173,11 @@
<translation>En krypteret pkcs12-pakke anbefales p? det kraftigste da en kopi vil blive opbevaret i konfigurationsfilen.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Browse ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>V?lg et certifikat</translation>
@@ -1190,34 +1228,34 @@
<translation>Forts?t</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 konti</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 konto</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 mapper</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 mappe</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Bagudkompatibel import</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1225,12 +1263,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Adgang til konfigurationsfilen fejlede</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>Der opstod en fejl under tilgang til konfigurationsfilen p? %1. V?r venligst sikker p? at filen kan tilg?s af din systemkonto.</translation>
</message>
@@ -1272,6 +1310,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1279,6 +1356,11 @@
<translation>Filen %1 kan ikke uploades fordi en anden fil med det samme navn, men blot med forskel i store/sm? bogstaver, eksisterer</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Filen %1 har ugyldig ?ndret tidspunkt. Upload ikke til serveren.</translation>
@@ -1483,7 +1565,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Fejl ved skrivning af metadata til databasen</translation>
</message>
@@ -1613,21 +1695,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Vil du slette mappen <i>%1</i> og alt dens indhold permanent?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Vil du slette filen <i>%1</i> permanent?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Bekr?ft sletning</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1643,30 +1710,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Ingen Nextcloud konto konfigureret</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Vil du slette mappen <i>%1</i> og alt dens indhold permanent?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Godkendelses fejl: Brugernavn eller kode er forkert.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Vil du slette filen <i>%1</i> permanent?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Bekr?ft sletning</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Timeout</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>De angivne legitimationsoplysninger er ikke korrekte</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>Den konfigurerede server til denne klient er for gammel.</translation>
@@ -1676,16 +1743,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Venligst opdater til den nyeste server og genstart klienten.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Godkendelses fejl: Brugernavn eller kode er forkert.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Ingen Nextcloud konto konfigureret</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>De angivne legitimationsoplysninger er ikke korrekte</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Fejl under annullering af sletning af en fil</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>Fejl under annullering af sletning af %1</translation>
</message>
@@ -1693,19 +1775,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Serverfejl: PROPFIND svar er ikke XML formateret!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>Krypterede metadata ops?tningsfejl!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>Krypterede metadata ops?tningsfejl: startsignatur fra server er tom.</translation>
</message>
@@ -1713,27 +1795,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Fejl under ?bning af mappe %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Mappe ikke tilg?ngelig p? klient. Tilladelse n?gtet</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Mappe ikke fundet: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>Filnavnskodning ikke gyldig</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Fejl ved l?sning af mappen %1</translation>
</message>
@@ -1973,11 +2055,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>Foresp?rgsels-URL'en starter ikke med HTTPS selvom log p? URL'en starter med HTTPS. Log p? vil ikke v?re muligt fordi dette kan v?re et sikkerhedsproblem. Kontakt venligst din administrator.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>Den returnerede URL starter ikke med HTTPS selvom log p? URL'en starter med HTTPS. Log p? vil ikke v?re muligt for dette kan v?re et sikkerhedsproblem. Kontakt venligst din administrator.</translation>
@@ -1989,28 +2066,33 @@
<translation>Fejl meddelelse fra serveren: <em>%1</em> </translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>Foresp?rgsels-URL'en starter ikke med HTTPS selvom log p? URL'en starter med HTTPS. Log p? vil ikke v?re muligt fordi dette kan v?re et sikkerhedsproblem. Kontakt venligst din administrator.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Der opstod en fejl under tilgang til "token" slutpunktet: <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Kunne ikke analysere den modtaget JSON fra serveren: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>Svaret fra serveren indeholder ikke alle forventede informationer.</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation>Svaret fra serveren indeholdt ikke alle forventede felter: <br><em>%1</em></translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Kunne ikke analysere den modtaget JSON fra serveren: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2053,6 +2135,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 er fjernet.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 er blevet opdateret.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 er blevet omd?bt til %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 er blevet flyttet til %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>V?lg venligst en anden placering. Mappen %1 eksisterer ikke.</translation>
@@ -2068,17 +2178,6 @@
<translation>V?lg venligst en anden placering. %1 er ikke en l?sbar mappe.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 og %n andre filer er blevet fjernet.</numerusform><numerusform>%1 og %n andre filer er blevet fjernet.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 er fjernet.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 og %n andre fil(er) er blevet tilf?jet.</numerusform><numerusform>%1 og %n andre fil(er) er blevet tilf?jet.</numerusform></translation>
@@ -2094,33 +2193,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 og %n anden fil er blevet opdateret.</numerusform><numerusform>%1 og %n andre filer er blevet opdateret.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 er blevet opdateret.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 er blevet omd?mt til %2 og %n anden fil er blevet omd?mt.</numerusform><numerusform>%1 er blevet omd?mt til %2 og %n andre filer er blevet omd?mt.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 er blevet omd?bt til %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 er blevet flyttet til %2 og %n anden fil er blevet flyttet.</numerusform><numerusform>%1 er blevet flyttet til %2 og %n andre filer er blevet flyttet.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 er blevet flyttet til %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2157,68 +2239,68 @@
<translation>Synkroniseringsaktivitet</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Kunne ikke l?se systemets udelukkelsesfil</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>En ny mappe med mere end %1M er blevet tilf?jet : %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>En mappe er blevet tilf?jet fra eksternt lager.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>G? venligst til indstillinger for at v?lge om du vil hente den.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>En mappe har overskredet den angivne mappegr?nse p? %1MB: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>Forts?t synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>Stop synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>Mappen %1 har overskredet den angivne mappest?rrelses gr?nse p? %2MB.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>?nsker du at stoppe synkronisering af denne mappe?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Mappen %1 er oprettet men tidligere udelukket fra synkronisering. Data i mappen vil ikke blive synkroniseret.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Filen %1 er oprettet men tidligere udelukket fra synkronisering. Den vil ikke blive synkroniseret.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2231,12 +2313,12 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>Virtuel fil download fejlede med koden "%1", status "%2" og fejlbeskeden "%3"</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2245,7 +2327,7 @@
Alternativt kan du genskabe alle slettede filer ved at uploade fra '%1' mappe til serveren.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2254,22 +2336,22 @@
Alternativt kan du genskabe alle slettede filer ved at downloade dem fra serveren.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>Slet alle filer?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>Forts?t med sletning</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>Genskab filer til serveren</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>Genskab filer fra serveren</translation>
</message>
@@ -2310,11 +2392,6 @@
<translation>Kunne ikke nulstille oprette mappetilstand</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>En gammel synkroniseringsjournal "%1" blev fundet, men kunne ikke fjernes. S?rg for, at ingen applikation bruger den i ?jeblikket.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation> (backup)</translation>
@@ -2325,6 +2402,11 @@
<translation> (backup %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>En gammel synkroniseringsjournal "%1" blev fundet, men kunne ikke fjernes. S?rg for, at ingen applikation bruger den i ?jeblikket.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Udefineret tilstand.</translation>
@@ -2395,16 +2477,6 @@
<translation>Synkroniseringsanmodning blev annulleret.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Synkronisering er pauset.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (Sync er sat p? pause)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>V?lg venligst en anden placering. Den valgte mappe er ikke gyldig.</translation>
@@ -2454,6 +2526,16 @@
For at l?se dette problem: fjern venligst %1 fra en af kontiene og opret en ny synkroniseringsmappe.
For avancerede brugere: dette problem kan v?re relateret til multiple synkroniserings databasefiler fundet i en mappe. Kontroller venligst %1 for udl?bne og ubrugte .sync_*.db filer og fjern dem.</translation>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Synkronisering er pauset.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (Sync er sat p? pause)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2497,16 +2579,6 @@
<translation>Fejl under indl?sning af listen af mapper fra serveren.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Henter mappelisten fra server ?</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Der er ul?ste konflikter. Klik for flere detaljer.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>Virtuel fil underst?ttelse er ikke aktiveret.</translation>
@@ -2548,16 +2620,31 @@
<translation>%1 %2 ...</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>Download %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>Fil %1 af %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Der er ul?ste konflikter. Klik for flere detaljer.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>Download %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Henter mappelisten fra server ?</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2604,21 +2691,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 af %2, fil %3 af %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>Fil %1 af %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>Venter p? %n anden folder ?</numerusform><numerusform>Venter p? %n andre mapper ?</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>P? vej til at starte synkronisering</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>Venter p? %n anden folder ?</numerusform><numerusform>Venter p? %n andre mapper ?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2778,11 +2860,6 @@
<translation>Generelle Indstillinger</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&K?r ved opstart af systemet</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>Vis opkaldsnotifikationer</translation>
@@ -2793,11 +2870,6 @@
<translation>Som Systembakke</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Anvend &monokrome ikoner</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>Vis chatnotifikationer</translation>
@@ -2813,17 +2885,32 @@
<translation>Avanceret</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Bed om bekr?ftelse, f?r du synkroniserer nye mapper st?rre end</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Sp?rg om bekr?ftelse inden synkronisering af eksterne lagre</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&K?r ved opstart af systemet</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Anvend &monokrome ikoner</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Bed om bekr?ftelse, f?r du synkroniserer nye mapper st?rre end</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>Giv besked, n?r synkroniserede mapper bliver st?rre end den angivne gr?nse</translation>
@@ -2834,11 +2921,6 @@
<translation>Deaktiver automatisk synkronisering af mapper, der overskrider gr?nsen</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Sp?rg om bekr?ftelse inden synkronisering af eksterne lagre</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>Flyt fjernede filer til papirkurven</translation>
@@ -2890,11 +2972,6 @@
<translation>Opdateringskanal</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Genstart && Opdater</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>&S?g automatisk efter opdateringer</translation>
@@ -2915,6 +2992,16 @@
<translation>Juridisk Notits</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Genstart && Opdater</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Server notifikationer der kr?ver opm?rksomhed.</translation>
@@ -2935,6 +3022,11 @@
<translation>Du kan ikke deaktivere autostart, fordi system- wide autostart er aktiveret.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>stabil</translation>
@@ -3016,6 +3108,11 @@
<source>Debug archive is created at %1</source>
<translation>Fejlarkivet oprettedes den %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3180,102 +3277,97 @@
<translation>Nyt filnavn</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Omd?b fil</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>Filen "%1" kunne ikke synkroniseres, fordi navnet indeholder tegn som ikke er tilladt p? dette system.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>F?lgende tegn er ikke tilladt p? systemet: * "Note 124; &?,;:\ / ~ < > indledende / afsluttende mellemrum</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>Filen "%1" kunne ikke synkroniseres, fordi navnet indeholder tegn som ikke er tilladt p? serveren.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>F?lgende tegn er ikke tilladt: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>F?lgende basenavne er ikke tilladt: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>F?lgende filnavne er ikke tilladt: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>F?lgende filudvidelser er ikke tilladt: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Kontrol af omd?bte tilladelser..</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>Du har ikke tilladelse til at omd?be denne fil. Bed venligst filens forfatter omd?be den.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>Kunne ikke hente tilladelser med fejl %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>Filnavn indeholder indledende og afsluttende mellemrum.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>Filnavn indeholder f?rende mellemrum.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>Filnavn indeholder efterf?lgende mellemrum.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>Brug ugyldigt navn</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>Filnavn indeholder ulovlige tegn: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>Kunne ikke omd?be filen. S?rg for at du er forbundet til serveren.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>Kan ikke omd?be fil fordi en fil med samme navn allerede findes p? serveren. V?lg et andet navn.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>Kunne ikke omd?be lokal fil. %1</translation>
</message>
@@ -3399,16 +3491,6 @@
<translation><p>En ny version af klienten %1 er til r?dighed.</p><p><b>%2</b>er til r?dighed til download. Den installerede version er %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Spring over denne gang</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Hent opdatering</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>Opdatering mislykkedes</translation>
@@ -3433,6 +3515,16 @@
<source>Update manually</source>
<translation>Opdatering manuelt</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Spring over denne gang</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Hent opdatering</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3457,6 +3549,23 @@
<translation>Proxy server kr?ver autentificering</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Download b?ndbredde</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Begr?ns til</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>Bem?rk: proxyindstillinger har ingen virkninger for konti p? localhost</translation>
@@ -3479,46 +3588,29 @@
<translation>Brug globale indstillinger</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Download b?ndbredde</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Ingen begr?nsning</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Begr?ns til</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Begr?ns til 3/4 af estimeret b?ndbredde</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Upload b?ndbredde</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Begr?ns automatisk</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Upload b?ndbredde</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Proxyservers v?rtsnavn</translation>
@@ -3547,6 +3639,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>Kunne ikke s?ge efter nye opdateringer.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Tjekker opdateringsserver ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>Ny opdatering af %1 klar</translation>
@@ -3577,11 +3679,6 @@
<translation>Kunne ikke downloade opdatering. ?bn venligst %1 for at downloade opdateringen manuelt.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>Kunne ikke s?ge efter nye opdateringer.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>Ny %1 er tilg?ngelig. ?bn venligst <a href='%2'>%2</a> for at downloade opdateringen.</translation>
@@ -3592,16 +3689,21 @@
<translation>Ny %1 er tilg?ngelig. ?bn venligst %2 for at downloade opdateringen.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Tjekker opdateringsserver ?</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Opdateringsstatus ukendt. S?gte ikke efter opdateringer.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Ingen opdateringer tilg?ngelige. Din installation k?rer nyeste version.</translation>
@@ -3777,11 +3879,6 @@
<translation><font color="green">Forbundet til %1: %2 version %3 (%4) med succes</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>Ugyldig URL</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Fejl ved forbindelse til %1 hos %2: <br/>%3</translation>
@@ -3792,6 +3889,16 @@
<translation>Timeout ved fors?g p? forbindelse til %1 hos %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Adgang forbudt fra serveren. For at kontrollere din adgang, <a href="%1">Klik her</a> for tilgang til servicen fra din browser.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>Ugyldig URL</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Pr?ver at forbinde til %1 hos %2 ?</translation>
@@ -3802,11 +3909,6 @@
<translation>Den bekr?ftede anmodning til serveren blev omdirigeret til "%1". URL'en er d?rlig, serveren er forkert konfigureret.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Adgang forbudt fra serveren. For at kontrollere din adgang, <a href="%1">Klik her</a> for tilgang til servicen fra din browser.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>Modtog ugyldigt svar p? autentificeret WebDAV foresp?rgsel</translation>
@@ -3949,7 +4051,7 @@
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="491"/>
<source>Enable experimental feature?</source>
- <translation>Aktiver eksperimentel funktion?</translation>
+ <translation>Aktiv?r eksperimentel funktion?</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="492"/>
@@ -3971,7 +4073,7 @@
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="506"/>
<source>Enable experimental placeholder mode</source>
- <translation>Aktiver eksperimentel pladsholdertilstand</translation>
+ <translation>Aktiv?r eksperimentel pladsholdertilstand</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="507"/>
@@ -4018,62 +4120,34 @@
<translation>Filnavne der slutter med en periode er ikke underst?ttet p? dette filsystem.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Mappe</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Fil</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>%1 navn som indeholder tegnet "%2" er ikke underst?ttet p? dette filsystem.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>%1 navn indeholder mindst et ugyldigt tegn</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>%1 navn er et reserveret navn p? dette filsystem.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4083,6 +4157,24 @@
<translation>Filnavn indeholder efterf?lgende mellemrum.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Mappe</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Fil</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>%1 navn som indeholder tegnet "%2" er ikke underst?ttet p? dette filsystem.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4091,6 +4183,16 @@
<translation>Kan ikke omd?bes eller uploades.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>%1 navn indeholder mindst ?t ugyldigt tegn</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>%1 navn er et reserveret navn p? dette filsystem.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>Filnavn indeholder f?rende mellemrum.</translation>
@@ -4181,64 +4283,74 @@
<translation>Server rapporterede ingen %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Kan ikke synkronisere p? grund af ugyldig ?ndringstid</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>Kunne ikke uploade filen, fordi den er ?ben i "%1".</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>Fejl under sletning af filregistrering %1 fra databasen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>Flyttet til ugyldig m?l, genoprette</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>Kan ikke ?ndre krypteret element, fordi det valgte certifikat ikke er gyldigt.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignoreret p? grund af "v?lg hvad du skal synkronisere" sortliste</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Ikke tilladt, fordi du ikke har tilladelse til at tilf?je undermapper til denne mappe</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Ikke tilladt, fordi du ikke har tilladelse til at tilf?je filer i denne mappe</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Ikke tilladt at uploade denne fil, fordi det er read- kun p? serveren, genoprette</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>Ikke tilladt at fjerne, genoprette</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Fejl under l?sning af databasen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>Serveren svarede med en fejl under l?sning af mappen "%1":%2</translation>
</message>
@@ -4246,38 +4358,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>Kunne ikke slette filen %1 fra lokal DB</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>Fejl ved opdatering af metadata p? grund af ugyldig ?ndringstid</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>Mappen %1 kan ikke s?ttes som skrivebeskyttet: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>ukendt undtagelse</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Fejl ved opdatering af metadata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>Filen er i brug</translation>
</message>
@@ -4295,12 +4407,6 @@
<translation>Filen %1 kan ikke downloades fordi krypteringsinformation mangler.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>Fil er ?ndret siden opdagelse</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4357,6 +4463,12 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>Fil er ?ndret siden opdagelse</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4374,39 +4486,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>kunne ikke slette fil %1, fejl: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4419,14 +4531,14 @@
<translation>Kunne ikke fjerne %1 p? grund af lokal filnavnskonflikt</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4434,49 +4546,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4533,39 +4645,39 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Forkert HTTP kode returneret fra server. Forventet 201, men modtog "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Fejl ved skrivning af metadata til databasen</translation>
</message>
@@ -4573,22 +4685,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>Fil %1 kan ikke sendes fordi en anden fil med samme navn eksisterer kun med forskel i store/sm? bogstaver.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>Forsendelse af %1 overskriver mappens kvota</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4596,11 +4697,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Fil fjernet (start forsendelse) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Lokal fil ?ndret under sync. Den vil blive genoptaget.</translation>
@@ -4630,6 +4726,22 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>Forsendelse af %1 overskriver mappens kvota</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Fil fjernet (start forsendelse) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4878,6 +4990,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Deling af kontekst menu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Jeg delte noget med dig</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Dele muligheder</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Send privat link via e-mail ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Kopier privat link til udklipsholderen</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4910,43 +5048,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Deling af kontekst menu</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Jeg delte noget med dig</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Dele muligheder</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Kopier privat link til udklipsholderen</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Send privat link via e-mail ?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4962,11 +5074,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Kopier internt link</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -4993,12 +5100,6 @@
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>?bn i browser</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation type="unfinished"/>
@@ -5028,6 +5129,17 @@
<source>Delete</source>
<translation>Slet</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Kopier internt link</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>?bn i browser</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5129,13 +5241,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Forbindelsen er IKKE sikret da den ikke er krypteret.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Server version: %1</translation>
@@ -5155,6 +5260,13 @@
<source>The connection is not secure</source>
<translation>Forbindelsen er ikke sikret</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Forbindelsen er IKKE sikret da den ikke er krypteret.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5247,6 +5359,32 @@
<translation>%1 (droppet p? grund af tidligere fejl, pr?ver igen om %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Kun %1 til r?dighed, beh?ver mindst %2 for at starte</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>Ikke i stand til at oprette en lokal sync database. Verificer at du har skriveadgang til sync mappen.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Diskplads begr?nset: Downloads der bringer ledig plads under %1 ignoreres.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>Der er utilstr?kkelig plads p? serveren til visse uploads.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Uafgjort konflikt.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation type="unfinished"/>
@@ -5267,22 +5405,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Uafgjort konflikt.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Kun %1 til r?dighed, beh?ver mindst %2 for at starte</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>Ikke i stand til at oprette en lokal sync database. Verificer at du har skriveadgang til sync mappen.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
@@ -5302,16 +5424,6 @@
<source>Cannot open the sync journal</source>
<translation>Kunne ikke ?bne synkroniserings loggen</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Diskplads begr?nset: Downloads der bringer ledig plads under %1 ignoreres.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>Der er utilstr?kkelig plads p? serveren til visse uploads.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5322,7 +5434,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>Du skal acceptere servicevilk?rene</translation>
</message>
@@ -5706,11 +5818,6 @@
<source>Less than a minute</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5718,20 +5825,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1 minut</numerusform><numerusform>%1 minutter</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1 time</numerusform><numerusform>%1 timer</numerusform></translation>
@@ -5746,6 +5843,21 @@
<source>%1 days</source>
<translation><numerusform>%1 dag</numerusform><numerusform>%1 dage</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5888,6 +6000,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Log venligst ind</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>Ingen synk.-mapper konfigureret.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Frakoblet fra %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Serverversion uden support</translation>
@@ -5908,31 +6035,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Frakoblet fra %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Frakoblet fra konti:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Konto %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Log venligst ind</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Kontosynkronisering er deaktiveret</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5954,11 +6056,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>Ingen synk.-mapper konfigureret.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation type="unfinished"/>
@@ -5969,6 +6066,21 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Frakoblet fra konti:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Konto %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Kontosynkronisering er deaktiveret</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5977,11 +6089,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Lokal mappe</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation type="unfinished"/>
@@ -6017,22 +6124,11 @@
<translation>Sp?rg f?r synk. af mapper st?rre end</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Sp?rg f?r synk. af eksterne lagerenheder</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>V?lg hvad der skal synkroniseres</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Behold lokale data</translation>
@@ -6047,6 +6143,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Slet den lokale mappe og start et rent synk.</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>V?lg hvad der skal synkroniseres</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Lokal mappe</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6087,6 +6199,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>i fremtiden</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>nu</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>For noget tid siden</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6127,57 +6284,12 @@
<source>Synced %1</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>i fremtiden</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>nu</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>For noget tid siden</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6423,6 +6535,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>?bn lokal mappe</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>?bn lokal mappe "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>?bn %1 i stifinder</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6612,16 +6767,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6636,6 +6781,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6869,16 +7024,16 @@
<translation>Fejl opstod under ops?tning</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Forbereder synkronisering</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>Standser synkronisering</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Forbereder synkronisering</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Synk. er p? pause</translation>
@@ -6937,4 +7092,17 @@
<translation>Frig?r lokal lagerplads</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>Aktiver for hurtig synk</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>Hurtig synk vil kun synkronisere ?ndringer i filer og mapper i mapper der er blevet gennemset. Dette kan ?ge responsiviteten markant ved den f?rste konfiguration af virtuelle filer. Dog vil det skabe redundante downloads af filer flyttet til en ikke gennemse mappe.</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_de.ts nextcloud-desktop-3.16.6/translations/client_de.ts
--- nextcloud-desktop-3.16.4/translations/client_de.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_de.ts 2025-06-18 22:57:35.000000000 +0200
@@ -102,7 +102,7 @@
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="164"/>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="226"/>
<source>No recently changed files</source>
- <translation>Keine k?rzlich ge?nderte Dateien</translation>
+ <translation>Keine k?rzlich ge?nderten Dateien</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="180"/>
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>Schnelle Synchronisierung aktivieren</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>Bei der schnellen Synchronisierung werden nur ?nderungen an Dateien und Ordnern innerhalb der Ordner synchronisiert, die bereits untersucht wurden. Dies kann die Reaktionsf?higkeit bei der Ersteinrichtung virtueller Dateien erheblich erh?hen. Allerdings f?hrt dies zu redundanten Downloads von Dateien, die in einen noch nicht erfassten Ordner verschoben wurden.</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>Virtuelle Dateien aktivieren</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation>L?schen von Objekten im Papierkorb zulassen</translation>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -419,12 +411,12 @@
<message>
<location filename="../src/libsync/filesystem.cpp" line="290"/>
<source>Error removing "%1": %2</source>
- <translation>Fehler beim Entfernen "%1": %2</translation>
+ <translation>Fehler beim Entfernen von "%1": %2</translation>
</message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="333"/>
<source>Could not remove folder "%1"</source>
- <translation>Der Ordner "%1" konnte nicht gel?scht werden</translation>
+ <translation>Der Ordner "%1" konnte nicht entfernt werden</translation>
</message>
</context>
<context>
@@ -558,7 +550,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Import fr?herer Konfiguration</translation>
</message>
@@ -573,7 +565,7 @@
<translation>?berspringen</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>Konten von ?lterer Client-Konfiguration konnten nicht importiert werden.</translation>
</message>
@@ -581,33 +573,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Speicherplatz: ?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Nicht markierte Ordner werden von Ihrem lokalen Dateisystem <b>entfernt</b> und werden auch nicht mehr auf diesem Rechner synchronisiert</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Abbrechen</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Anwenden</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Verbunden mit <server> als <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Alles synchronisieren</translation>
@@ -638,6 +608,33 @@
<translation>Verbindungseinstellungen</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Anwenden</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Speicherplatz: ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Abbrechen</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Verbunden mit <server> als <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Kein Konto konfiguriert.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>Ende-zu-Ende-Verschl?sselung mit virtuellen Dateien</translation>
@@ -672,9 +669,9 @@
<b>Dies kann nicht r?ckg?ngig gemacht werden. Sind Sie sicher, dass Sie fortfahren m?chten?</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Kein Konto konfiguriert.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation>Verschl?sselungseinrichtung vergessen</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -687,6 +684,11 @@
<translation>Ged?chtnisst?tze anzeigen</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation>Die Verschl?sselung ist eingerichtet. Nicht vergessen, einen Ordner zu <b>verschl?sseln</b>, um alle neu hinzugef?gten Dateien Ende-zu-Ende zu verschl?sseln.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>F?r dieses Konto wurde die Ende-zu-Ende-Verschl?sselung aktiviert</translation>
@@ -704,12 +706,19 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="404"/>
<source>The folder has a minor sync problem. Encryption of this folder will be possible once it has synced successfully</source>
- <translation>Der Ordner weist ein geringf?giges Synchronisierungsproblem auf. Die Verschl?sselung dieses Ordners ist m?glich, sobald er erfolgreich synchronisiert wurde</translation>
+ <translation>Der Ordner weist ein geringf?giges Synchronisierungsproblem auf. Die Verschl?sselung dieses Ordners ist m?glich, sobald er synchronisiert wurde</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="406"/>
<source>The folder has a sync error. Encryption of this folder will be possible once it has synced successfully</source>
- <translation>Der Ordner weist einen Synchronisierungsfehler auf. Die Verschl?sselung dieses Ordners ist m?glich, sobald er erfolgreich synchronisiert wurde</translation>
+ <translation>Der Ordner weist einen Synchronisierungsfehler auf. Die Verschl?sselung dieses Ordners ist m?glich, sobald er synchronisiert wurde</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation>Dieser Ordner kann nicht verschl?sselt werden, da die Ende-zu-Ende-Verschl?sselung auf diesem Ger?t noch nicht eingerichtet ist.
+M?chten Sie dies jetzt tun?</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
@@ -735,12 +744,6 @@
<translation>Der Ordner konnte nicht verschl?sselt werden, da er nicht mehr existiert</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Ordner ?ffnen</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Verschl?sseln</translation>
@@ -779,16 +782,6 @@
<translation>Synchronisierung neustarten</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Synchronisierung fortsetzen</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Synchronisierung pausieren</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Ordner-Synchronisierung entfernen</translation>
@@ -814,21 +807,11 @@
<translation>Anlegen des Ordners fehlgeschlagen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Konnte lokalen Ordner <i>%1</i> nicht anle?gen.?</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Best?tigen Sie die L?schung der Ordner-Synchronisierung</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>M?chten Sie den Ordner <i>%1</i> nicht mehr synchronisieren?</p><p><b>Anmerkung:</b> Dies wird <b>keine</b> Dateien l?schen.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Ordner-Synchronisierung entfernen</translation>
@@ -862,24 +845,24 @@
<translation>Ged?chtnisst?tze f?r die Ende-zu-Ende-Verschl?sselung</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>Um Ihre kryptografische Identit?t zu sch?tzen, verschl?sseln wir sie mit einer Ged?chtnisst?tze von 12 W?rterbuchw?rtern. Bitte notieren Sie sich diese und bewahren Sie sie auf. Sie werden ben?tigt, um Ihrem Konto weitere Ger?te hinzuzuf?gen (z. B. Ihr Mobiltelefon oder Laptop).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation>Um Ihre kryptografische Identit?t zu sch?tzen, verschl?sseln wir sie mit einer Eselsbr?cke aus zw?lf W?rtern aus dem W?rterbuch. Bitte notieren Sie sich diese und bewahren Sie sie sicher auf. Sie ben?tigen sie, um die Synchronisierung verschl?sselter Ordner auf Ihren anderen Ger?ten einzurichten.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>Ende-zu-Ende-Verschl?sselung deaktivieren</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation>Die Ende-zu-Ende-Verschl?sselung auf diesem Ger?t vergessen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>Ende-zu-Ende-Verschl?sselung f?r %1 deaktivieren?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation>Soll die Ende-zu-Ende-Verschl?sselungseinstellungen f?r %1 auf diesem Ger?t vergessen werden?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>Durch das Entfernen der Ende-zu-Ende-Verschl?sselung werden lokal synchronisierte Dateien entfernt, die verschl?sselt sind.<br>Verschl?sselte Dateien verbleiben auf dem Server.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation>Wenn die Ende-zu-Ende-Verschl?sselung vergessen wird, werden die vertraulichen Daten und alle verschl?sselten Dateien von diesem Ger?t entfernt. Die verschl?sselten Dateien verbleiben jedoch auf dem Server und allen Ihren anderen Ger?ten, sofern eingerichtet.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -892,34 +875,44 @@
<translation>Die Synchronisierung l?uft gerade.<br/>Wollen Sie diese beenden?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) von %2 Serverkapazit?t verwendet. Einige Ordner, einschlie?lich ?ber das Netzwerk verbundene oder geteilte Ordner, k?nnen unterschiedliche Beschr?nkungen aufweisen. </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 wird verwendet</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 von %2 Serverkapazit?t verwendet</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>Zertifikat auf ein neues migrieren</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Derzeit sind keine Speichernutzungsinformationen verf?gbar.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>Es gibt Ordner, deren Gr??e ?ber %1 MB hinaus gewachsen ist: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 wird verwendet</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation>Die Ende-zu-Ende-Verschl?sselung wurde f?r dieses Konto mit einem anderen Ger?t initialisiert. <br>Geben Sie den eindeutigen Mnemonic ein, um die verschl?sselten Ordner auch auf diesem Ger?t zu synchronisieren.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 als %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>Die Ende-zu-Ende-Verschl?sselung wurde auf diesem Konto mit einem anderen Ger?t aktiviert.<br>Sie kann auf diesem Ger?t durch Eingabe Ihrer Ged?chtnisst?tze aktiviert werden.<br>Dadurch wird die Synchronisierung vorhandener verschl?sselter Ordner aktiviert.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>Die Serverversion %1 wird nicht unterst?tzt! Fortfahren auf eigenes Risiko.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation>Dieses Konto unterst?tzt die Ende-zu-Ende-Verschl?sselung, diese muss aber zuerst eingerichtet werden.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Verschl?sselung einrichten</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Dieses Konto unterst?tzt Ende-zu-Ende-Verschl?sselung</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -937,79 +930,125 @@
<translation>Server %1 befindet sich im Wartungsmodus.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>Server %1 wird derzeit umgeleitet oder Ihre Verbindung befindet sich hinter einem Captive-Portal.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Abgemeldet von %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Verbinde zu %1 ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Einige Ordner konnten nicht synchronisiert werden, da sie zu gro? sind:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>Verbindung zu %1 kann nicht hergestellt werden.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Es gibt Ordner, die nicht synchronisiert werden konnten, da sie externe Speicher sind:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Konfigurationsfehler des Servers: %1 auf %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Es gibt Ordner, die nicht synchronisiert werden konnten, da sie zu gro? oder externe Speicher sind:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>Die Nutzungsbedingungen unter %1 m?ssen best?tigt werden.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Ordner ?ffnen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Keine %1-Verbindung konfiguriert.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Synchronisierung fortsetzen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>Zertifikat auf ein neues migrieren</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Synchronisierung pausieren</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Einige Ordner konnten nicht synchronisiert werden, da sie zu gro? sind:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Konnte lokalen Ordner <i>%1</i> nicht anle?gen.?</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Es gibt Ordner, die nicht synchronisiert werden konnten, da sie externe Speicher sind:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>M?chten Sie den Ordner <i>%1</i> nicht mehr synchronisieren?</p><p><b>Anmerkung:</b> Dies wird <b>keine</b> Dateien l?schen.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Es gibt Ordner, die nicht synchronisiert werden konnten, da sie zu gro? oder externe Speicher sind:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>Um Ihre kryptografische Identit?t zu sch?tzen, verschl?sseln wir sie mit einer Ged?chtnisst?tze von 12 W?rterbuchw?rtern. Bitte notieren Sie sich diese und bewahren Sie sie auf. Sie werden ben?tigt, um Ihrem Konto weitere Ger?te hinzuzuf?gen (z. B. Ihr Mobiltelefon oder Laptop).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>Es gibt Ordner, deren Gr??e ?ber %1 MB hinaus gewachsen ist: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>Ende-zu-Ende-Verschl?sselung deaktivieren</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>Die Ende-zu-Ende-Verschl?sselung wurde auf diesem Konto mit einem anderen Ger?t aktiviert.<br>Sie kann auf diesem Ger?t durch Eingabe Ihrer Ged?chtnisst?tze aktiviert werden.<br>Dadurch wird die Synchronisierung vorhandener verschl?sselter Ordner aktiviert.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>Ende-zu-Ende-Verschl?sselung f?r %1 deaktivieren?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Dieses Konto unterst?tzt Ende-zu-Ende-Verschl?sselung</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>Durch das Entfernen der Ende-zu-Ende-Verschl?sselung werden lokal synchronisierte Dateien entfernt, die verschl?sselt sind.<br>Verschl?sselte Dateien verbleiben auf dem Server.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Verschl?sselung einrichten</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) von %2 Serverkapazit?t verwendet. Einige Ordner, einschlie?lich ?ber das Netzwerk verbundene oder geteilte Ordner, k?nnen unterschiedliche Beschr?nkungen aufweisen. </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 von %2 Serverkapazit?t verwendet</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Derzeit sind keine Speichernutzungsinformationen verf?gbar.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 als %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>Die Serverversion %1 wird nicht unterst?tzt! Fortfahren auf eigenes Risiko.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>Server %1 wird derzeit umgeleitet oder Ihre Verbindung befindet sich hinter einem Captive-Portal.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Verbinde zu %1 ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>Verbindung zu %1 kann nicht hergestellt werden.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Konfigurationsfehler des Servers: %1 auf %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>Die Nutzungsbedingungen unter %1 m?ssen best?tigt werden.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Keine %1-Verbindung konfiguriert.</translation>
</message>
</context>
<context>
@@ -1124,11 +1163,6 @@
<translation>Zertifikat & Schl?ssel (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Durchsuchen ?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Zertifikatspasswort:</translation>
@@ -1139,6 +1173,11 @@
<translation>Ein verschl?sseltes pkcs12-Bundle wird dringend empfohlen, da eine Kopie in der Konfigurationsdatei gespeichert wird.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Durchsuchen ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Zertifikat ausw?hlen</translation>
@@ -1189,34 +1228,34 @@
<translation>Fortsetzen</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 Konten</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 Konto</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 Ordner</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 Ordner</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Import fr?herer Konfiguration</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1224,12 +1263,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Fehler beim Zugriff auf die Konfigurationsdatei</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>Beim Zugriff auf die Konfigurationsdatei unter %1 ist ein Fehler aufgetreten. Stellen Sie sicher, dass Ihr Systemkonto auf die Datei zugreifen kann.</translation>
</message>
@@ -1271,6 +1310,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation>Datei hat sich seit der Entdeckung ge?ndert</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation>Dateidatensatz %1 konnte nicht aus der lokalen Datenbank gel?scht werden</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation>Die Datei %1 kann nicht heruntergeladen werden, da sie nicht virtuell ist!</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation>Datei %1 konnte nicht aus der lokalen Datenbank abgerufen werden</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation>Die Datei %1 kann nicht heruntergeladen werden, da die Verschl?sselungsinformationen fehlen.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation>Fehler beim Aktualisieren der Metadaten: %1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation>Die Datei %1 ist derzeit in Gebrauch</translation>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1278,6 +1356,11 @@
<translation>Die Datei %1 kann nicht hochgeladen werden, da eine andere Datei mit demselben Namen, nur unterschiedlicher Gro?-/Kleinschreibung, existiert</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation>Dateiname enth?lt Leerzeichen am Anfang oder am Ende und konnte nicht umbenannt werden</translation>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Die Datei %1 hat eine ung?ltige ?nderungszeit. Nicht auf den Server hochladen.</translation>
@@ -1321,7 +1404,7 @@
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="736"/>
<source>The local file was removed during sync.</source>
- <translation>Die lokale Datei wurde w?hrend der Synchronisierung gel?scht.</translation>
+ <translation>Die lokale Datei wurde w?hrend der Synchronisierung entfernt.</translation>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="784"/>
@@ -1349,7 +1432,7 @@
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
<source>Failed to fetch permissions with error %1</source>
- <translation>Fehler beim Abrufen der Berechtigungen. Fehler %1</translation>
+ <translation>Berechtigungen konnten nicht abgerufen werden. Fehler: %1</translation>
</message>
<message>
<location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
@@ -1482,7 +1565,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
</message>
@@ -1548,7 +1631,7 @@
<location filename="../src/gui/conflictdialog.ui" line="57"/>
<location filename="../src/gui/conflictdialog.ui" line="165"/>
<source>Click to open the file</source>
- <translation>Klicken um die Datei zu ?ffnen</translation>
+ <translation>Klicken, um die Datei zu ?ffnen</translation>
</message>
<message>
<location filename="../src/gui/conflictdialog.ui" line="96"/>
@@ -1612,21 +1695,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>M?chten Sie den Ordner <i>%1</i> und dessen Inhalte dauerhaft l?schen?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>M?chten Sie die Datei <i>%1</i> dauerhaft l?schen?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>L?schen best?tigen</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1642,30 +1710,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Kein Nextcloud-Konto konfiguriert</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>M?chten Sie den Ordner <i>%1</i> und dessen Inhalte dauerhaft l?schen?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Authentifizierungsfehler: Benutzername oder Passwort ist falsch.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>M?chten Sie die Datei <i>%1</i> dauerhaft l?schen?</translation>
</message>
<message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>L?schen best?tigen</translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
+ <message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Zeit?berschreitung</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Die zur Verf?gung gestellten Anmeldeinformationen sind nicht korrekt</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>Der konfigurierte Server ist f?r diesen Client zu alt</translation>
@@ -1675,16 +1743,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Aktualisieren Sie auf die neueste Serverversion und starten Sie den Client neu.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Authentifizierungsfehler: Benutzername oder Passwort ist falsch.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Kein Nextcloud-Konto konfiguriert</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Die zur Verf?gung gestellten Anmeldeinformationen sind nicht korrekt</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Fehler beim Abbrechen des L?schens einer Datei</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>Fehler beim Abbrechen des L?schens von %1</translation>
</message>
@@ -1692,19 +1775,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Serverantwort: PROPFIND-Antwort ist nicht im XML-Format!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>Einrichtungsfehler f?r verschl?sselte Metadaten!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>Fehler bei der Einrichtung der verschl?sselten Metadaten: Die urspr?ngliche Signatur vom Server ist leer.</translation>
</message>
@@ -1712,27 +1795,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Fehler beim ?ffnen des Ordners %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Verzeichnis auf dem Client nicht zugreifbar, Berechtigung verweigert</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Ordner nicht gefunden: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>Dateinamenkodierung ist ung?ltig</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Fehler beim Lesen des Ordners %1</translation>
</message>
@@ -1921,7 +2004,7 @@
<message>
<location filename="../src/libsync/encryptedfoldermetadatahandler.cpp" line="341"/>
<source>Failed to upload metadata</source>
- <translation>Fehler beim Hochladen der Metadaten</translation>
+ <translation>Metadaten konnten nicht hochgeladen werden</translation>
</message>
</context>
<context>
@@ -1972,11 +2055,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>Die Polling-URL beginnt nicht mit HTTPS, obwohl die Anmelde-URL mit HTTPS beginnt. Die Anmeldung ist nicht m?glich, da dies ein Sicherheitsproblem darstellen k?nnte. Bitte wenden Sie sich an Ihre Administration.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>Die zur?ckgegebene Server-URL beginnt nicht mit HTTPS, obwohl die Anmelde-URL mit HTTPS beginnt. Die Anmeldung ist nicht m?glich, da dies ein Sicherheitsproblem darstellen k?nnte. Bitte wenden Sie sich an Ihre Administration.</translation>
@@ -1988,28 +2066,33 @@
<translation>Vom Server zur?ckgegebener Fehler: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>Die Polling-URL beginnt nicht mit HTTPS, obwohl die Anmelde-URL mit HTTPS beginnt. Die Anmeldung ist nicht m?glich, da dies ein Sicherheitsproblem darstellen k?nnte. Bitte wenden Sie sich an Ihre Administration.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Fehler beim Zugriff auf den "Token"-Endpunkt: <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Der vom Server zur?ckgegebene JSON-Code konnte nicht verarbeitet werden: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>Die Antwort des Servers enthielt nicht alle erwarteten Felder</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation>Die Antwort des Servers enthielt nicht alle erwarteten Felder: <br><em>%1</em></translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Der vom Server zur?ckgegebene JSON-Code konnte nicht verarbeitet werden: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2052,6 +2135,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 wurde entfernt.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 wurde aktualisiert.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 wurde in %2 umbenannt.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 wurde in %2 verschoben.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation><numerusform>%1 und %n andere Datei wurden gel?scht.</numerusform><numerusform>%1 und %n andere Dateien wurden entfernt.</numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>Bitte w?hlen Sie einen anderen Speicherort. Der Ordner %1 ist nicht vorhanden.</translation>
@@ -2067,17 +2178,6 @@
<translation>Bitte w?hlen Sie einen anderen Speicherort. %1 ist kein lesbarer Ordner.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 und %n andere Datei wurde gel?scht.</numerusform><numerusform>%1 und %n andere Dateien wurden gel?scht.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 wurde gel?scht.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 und %n andere Datei wurden hinzugef?gt.</numerusform><numerusform>%1 und %n andere Dateien wurden hinzugef?gt.</numerusform></translation>
@@ -2093,33 +2193,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 und %n andere Datei wurde aktualisiert.</numerusform><numerusform>%1 und %n andere Dateien wurden aktualisiert.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 wurde aktualisiert.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 wurde in %2 umbenannt und %n andere Datei wurde umbenannt.</numerusform><numerusform>%1 wurde in %2 umbenannt und %n andere Dateien wurden umbenannt.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 wurde in %2 umbenannt.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 wurde in %2 verschoben und %n andere Datei wurde verschoben.</numerusform><numerusform>%1 wurde in %2 verschoben und %n andere Dateien wurden verschoben.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 wurde in %2 verschoben.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2156,68 +2239,68 @@
<translation>Synchronisierungsaktivit?t</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Systemeigene Ausschlussdatei kann nicht gelesen werden</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Ein neuer Ordner gr??er als %1 MB wurde hinzugef?gt: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Ein Ordner von einem externen Speicher wurde hinzugef?gt.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Bitte wechseln Sie zu den Einstellungen, falls Sie den Ordner herunterladen m?chten.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>Ein Ordner hat die festgelegte Ordnergr??enbeschr?nkung von %1 MB ?berschritten: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>Weiterhin synchronisieren</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>Synchronisation stoppen</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>Der Ordner %1 hat die festgelegte Gr??enbeschr?nkung von %2 MB ?berschritten.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>M?chten Sie die Synchronisierung dieses Ordners stoppen?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Der Ordner %1 wurde erstellt, wurde jedoch zuvor von der Synchronisierung ausgeschlossen. Die darin enthaltenen Daten werden nicht synchronisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Die Datei % 1 wurde erstellt, jedoch bereits zuvor von der Synchronisierung ausgeschlossen. Sie wird nicht synchronisiert werden.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2230,12 +2313,12 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>Der Download der virtuellen Datei ist mit dem Code "%1", dem Status "%2" und der Fehlermeldung "%3" fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2244,7 +2327,7 @@
Alternativ k?nnen Sie alle gel?schten Dateien wiederherstellen, indem Sie von Ordner '%1' auf den Server hochladen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2253,22 +2336,22 @@
Alternativ k?nnen Sie auch alle gel?schten Dateien wiederherstellen, indem Sie sie vom Server herunterladen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>Alle Dateien entfernen?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>Mit der L?schung fortfahren</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>Dateien auf dem Server wiederherstellen</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>Dateien vom Server wiederherstellen</translation>
</message>
@@ -2309,11 +2392,6 @@
<translation>Konnte Ordner-Zustand nicht zur?cksetzen</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>Ein altes Synchronisierungsprotokoll "%1" wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(Sicherung)</translation>
@@ -2324,6 +2402,11 @@
<translation>(Sicherung %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>Ein altes Synchronisierungsprotokoll "%1" wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Undefinierter Zustand.</translation>
@@ -2394,16 +2477,6 @@
<translation>Synchronisierungsanfrage wurde abgebrochen.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Synchronisierung ist pausiert.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (Synchronisierung ist pausiert)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>Bitte w?hlen Sie einen anderen Speicherort. Der ausgew?hlte Ordner ist ung?ltig.</translation>
@@ -2453,6 +2526,16 @@
So beheben Sie dieses Problem: Entfernen Sie %1 von einem der Konten und erstellen Sie einen neuen Synchronisierungsordner.
F?r fortgeschrittene Benutzer: Dieses Problem kann damit zusammenh?ngen, dass sich mehrere Synchronisierungsdatenbankdateien in einem Ordner befinden. Suchen Sie in %1 nach veralteten und nicht verwendeten .sync_*.db-Dateien und entfernen Sie diese.</translation>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Synchronisierung ist pausiert.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (Synchronisierung ist pausiert)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2496,16 +2579,6 @@
<translation>Fehler beim Empfang der Ordnerliste vom Server.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Rufe Ordnerliste vom Server ab ?</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Es existieren ungel?ste Konflikte. F?r Details klicken.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>Unterst?tzung f?r virtuelle Dateien ist aktiviert.</translation>
@@ -2547,16 +2620,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>%1/s herunterladen</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>Datei %1 von %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Es existieren ungel?ste Konflikte. F?r Details klicken.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>%1/s herunterladen</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Rufe Ordnerliste vom Server ab ?</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2603,21 +2691,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 of %2, Datei %3 von %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>Datei %1 von %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>Warte auf %n anderen Ordner ?</numerusform><numerusform>Warte auf %n andere Ordner ?</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>Die Synchronisierung beginnt</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>Warte auf %n anderen Ordner ?</numerusform><numerusform>Warte auf %n andere Ordner ?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2658,7 +2741,7 @@
<message>
<location filename="../src/gui/folderwizard.cpp" line="85"/>
<source>Click to select a local folder to sync.</source>
- <translation>Hier klicken um einen lokalen Ordner zum Synchronisieren auszuw?hlen.</translation>
+ <translation>Hier klicken, um einen lokalen Ordner zum Synchronisieren auszuw?hlen.</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="92"/>
@@ -2696,12 +2779,12 @@
<message>
<location filename="../src/gui/folderwizard.cpp" line="266"/>
<source>Failed to create the folder on %1. Please check manually.</source>
- <translation>Die Erstellung des Ordners auf %1 ist fehlgeschlagen. Bitte pr?fen Sie dies manuell.</translation>
+ <translation>Der Ordner konnte nicht auf %1 erstellt werden. Bitte pr?fen Sie dies manuell.</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="284"/>
<source>Failed to list a folder. Error: %1</source>
- <translation>Konnte Ordner nicht listen. Fehler: %1</translation>
+ <translation>Ordner konnte nicht gelistet werden. Fehler: %1</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="365"/>
@@ -2777,11 +2860,6 @@
<translation>Allgemeine Einstellungen</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>Beim &Systemstart starten</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>Anrufbenachrichtigungen anzeigen</translation>
@@ -2792,11 +2870,6 @@
<translation>F?r das Systembenachrichtungsfeld</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>&Monochrome Symbole verwenden</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>Chat-Benachrichtigungen anzeigen</translation>
@@ -2812,20 +2885,35 @@
<translation>Erweitert</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Um eine Best?tigung bitten, bevor Sie neue Ordner synchronisieren, die gr??er sind als</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Best?tigung erfragen, bevor externe Speicher synchronisiert werden</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>Beim &Systemstart starten</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>&Monochrome Symbole verwenden</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Best?tigung erfragen, bevor neue Ordner synchronisiert werden, die gr??er sind als</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
- <translation>Benachrichtigen, wenn synchronisierte Ordner gr??er werden als die angegebene Grenze</translation>
+ <translation>Benachrichtigen, wenn synchronisierte Ordner gr??er werden als das angegebene Limit</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="170"/>
@@ -2833,14 +2921,9 @@
<translation>Automatisch die Synchronisierung von Ordnern beenden, die das Limit ?berschreiten</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Best?tigung erfragen, bevor externe Speicher synchronisiert werden</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
- <translation>Gel?schte Dateien in den Papierkorb verschieben</translation>
+ <translation>Entfernte Dateien in den Papierkorb verschieben</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="205"/>
@@ -2889,11 +2972,6 @@
<translation>Update-Kanal</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Neustarten && aktualisieren</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>&Automatisch auf Aktualisierungen pr?fen</translation>
@@ -2914,6 +2992,16 @@
<translation>Impressum</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation>Wiederherstellen auf &Standard</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Neustarten && aktualisieren</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Server-Benachrichtigungen, die Aufmerksamkeit erfordern.</translation>
@@ -2934,6 +3022,11 @@
<translation>Sie k?nnen den Autostart nicht deaktivieren, da der systemweite Autostart aktiviert ist.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation>Wiederherstellen auf &%1</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>Stabil</translation>
@@ -3014,6 +3107,11 @@
<source>Debug archive is created at %1</source>
<translation>Debug-Archiv erstellt in %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation>Informationen, die als vertraulich gelten, vor der Weitergabe redigieren! Debug-Archiv erstellt unter %1</translation>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3127,7 +3225,7 @@
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation>Dateien oder Ordner, die diesem Muster entsprechen, werden nicht synchronisiert.
-Objekte, bei denen L?schen erlaubt ist, werden gel?scht, wenn diese das L?schen eines Ordners verhindern w?rden. Dies ist f?r Metadaten n?tzlich.</translation>
+Objekte, bei denen L?schen erlaubt ist, werden gel?scht, wenn diese das Entfernen eines Ordners verhindern w?rden. Dies ist f?r Metadaten n?tzlich.</translation>
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.cpp" line="93"/>
@@ -3178,102 +3276,97 @@
<translation>Neuer Dateiname</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Datei umbenennen</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>Die Datei "%1" konnte nicht synchronisiert werden, da der Name Zeichen enth?lt, die auf diesem System nicht zul?ssig sind.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>Die folgenden Zeichen sind auf dem System nicht erlaubt: * " | & ? , ; : \ / ~ < > Leerzeichen am Anfang/Ende</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation>Die folgenden Zeichen sind auf dem System nicht zul?ssig: \ / : ? * " < > | f?hrende/nachgestellte Leerzeichen</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>Die Datei "%1" konnte nicht synchronisiert werden, da der Name Zeichen enth?lt, die auf dem Server unzul?ssig sind.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>Die folgenden Zeichen sind nicht erlaubt: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>Die folgenden Basisnamen sind nicht erlaubt: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>Die folgenden Dateinamen sind nicht erlaubt: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>Die folgenden Dateierweiterungen sind nicht erlaubt: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Pr?fe Umbenennungs-Rechte ?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>Sie haben nicht die Berechtigung, diese Datei umzubenennen. Bitte wenden Sie sich an den Autor der Datei, um sie umzubenennen.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
- <translation>Konnte Rechte nicht abrufen. Fehler %1</translation>
+ <translation>Rechte konnten nicht abgerufen werden. Fehler: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>Dateiname enth?lt Leerzeichen am Anfang und am Ende.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>Dateiname enth?lt Leerzeichen am Anfang.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>Dateiname enth?lt Leerzeichen am Ende.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>Ung?ltigen Namen verwenden</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>Dateiname enth?lt unzul?ssige Zeichen: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>Datei konnte nicht umbenannt werden. Bitte stellen Sie sicher, dass Sie mit dem Server verbunden sind.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>Die Datei kann nicht umbenannt werden, da eine Datei mit demselben Namen bereits auf dem Server existiert. Bitte w?hlen Sie einen anderen Namen.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>Lokale Datei konnte nicht umbenannt werden. %1</translation>
</message>
@@ -3397,16 +3490,6 @@
<translation><p>Eine neue Version des %1 - Clients ist verf?gbar.</p><p><b>%2</b> steht zum Herunterladen bereit. Die installierte Version ist %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Dieses Mal ?berspringen</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Aktualisierung durchf?hren</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>Aktualisierung fehlgeschlagen</translation>
@@ -3431,6 +3514,16 @@
<source>Update manually</source>
<translation>Manuell aktualisieren</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Dieses Mal ?berspringen</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Aktualisierung durchf?hren</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3455,6 +3548,23 @@
<translation>Proxy-Server erfordert eine Authentifizierung</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Download-Bandbreite</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Begrenzen auf</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>Hinweis: Proxy-Einstellungen haben keine Auswirkungen f?r Konten auf localhost</translation>
@@ -3477,46 +3587,29 @@
<translation>Globale Einstellungen verwenden</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Download-Bandbreite</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Keine Begrenzung</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Begrenzen auf</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Auf 3/4 der gesch?tzten Bandbreite begrenzen</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Upload-Bandbreite</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Automatisch begrenzen</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Upload-Bandbreite</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Hostname des Proxy-Servers</translation>
@@ -3545,6 +3638,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>Auf neue Aktualisierungen kann nicht gepr?ft werden.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Aktualisierungsserver wird ?berpr?ft ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>Neue %1 Aktualisierung verf?gbar</translation>
@@ -3575,11 +3678,6 @@
<translation>Aktualisierung kann nicht heruntergeladen werden. Bitte ?ffnen Sie %1, um die Aktualisierung manuell herunterzuladen.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>Auf neue Aktualisierungen kann nicht gepr?ft werden.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>Neue Version von %1 vorhanden. Bitte ?ffnen Sie <a href='%2'>%2</a>, um die Aktualisierung herunterzuladen.</translation>
@@ -3590,19 +3688,24 @@
<translation>Neue Version von %1 vorhanden. Bitte ?ffnen Sie %2, um die Aktualisierung herunterzuladen.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Aktualisierungsserver wird ?berpr?ft ?</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Aktualisierungsstatus unbekannt: Auf neue Aktualisierungen wurde nicht gepr?ft.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation>Sie verwenden den Update-Kanal %1. Ihre Installation ist die neueste Version.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation>Keine Aktualisierungen verf?gbar. Ihre Installation ist die neueste Version.</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
- <translation>Keine Aktualisierungen verf?gbar. Ihre Installation ist die aktuelle Version.</translation>
+ <translation>Keine Aktualisierungen verf?gbar. Ihre Installation ist auf dem neuesten Stand.</translation>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="195"/>
@@ -3775,11 +3878,6 @@
<translation><font color="green">Erfolgreich mit %1 verbunden: %2 Version %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>Ung?ltige URL</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Die Verbindung zu %1 auf %2 konnte nicht hergestellt werden: <br/>%3</translation>
@@ -3790,6 +3888,16 @@
<translation>Zeit?berschreitung beim Verbindungsversuch mit %1 unter %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Zugang vom Server nicht erlaubt. <a href="%1">Klicken Sie hier</a> zum Zugriff auf den Dienst mithilfe Ihres Browsers, so dass Sie sicherstellen k?nnen, dass Ihr Zugang ordnungsgem?? funktioniert.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>Ung?ltige URL</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Verbindungsversuch mit %1 unter %2 ?</translation>
@@ -3800,11 +3908,6 @@
<translation>Die Authentifizierungs-Anfrage an den Server wurde weitergeleitet an "%1". Diese Adresse ist ung?ltig, der Server ist falsch konfiguriert.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Zugang vom Server nicht erlaubt. <a href="%1">Klicken Sie hier</a> zum Zugriff auf den Dienst mithilfe Ihres Browsers, so dass Sie sicherstellen k?nnen, dass Ihr Zugang ordnungsgem?? funktioniert.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>Ung?ltige Antwort auf eine WebDAV-Authentifizierungs-Anfrage</translation>
@@ -3852,7 +3955,7 @@
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="596"/>
<source>Remote folder %1 created successfully.</source>
- <translation>Entfernter Ordner %1 erfolgreich erstellt.</translation>
+ <translation>Entfernter Ordner %1 erstellt.</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="611"/>
@@ -3889,7 +3992,7 @@
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="646"/>
<source>Successfully connected to %1!</source>
- <translation>Erfolgreich verbunden mit %1!</translation>
+ <translation>Erfolgreich mit %1 verbunden!</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="653"/>
@@ -3909,7 +4012,7 @@
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="696"/>
<source><font color="green"><b>File Provider-based account %1 successfully created!</b></font></source>
- <translation><font color="green"><b>Dateianbieter-basiertes Konto %1 erfolgreich erstellt!</b></font></translation>
+ <translation><font color="green"><b>Dateianbieter-basiertes Konto %1 erstellt!</b></font></translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="701"/>
@@ -3924,7 +4027,7 @@
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="745"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
- <translation><font color="green"><b>Lokaler Sync-Ordner %1 erfolgreich erstellt!</b></font></translation>
+ <translation><font color="green"><b>Lokaler Sync-Ordner %1 erstellt!</b></font></translation>
</message>
</context>
<context>
@@ -4016,62 +4119,34 @@
<translation>Dateinamen, die mit einem Punkt enden, werden von diesem Dateisystem nicht unterst?tzt.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Ordner</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Datei</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation>Ordnernamen, die das Zeichen "%1" enthalten, werden von diesem Dateisystem nicht unterst?tzt.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>%1 Namen, die das Zeichen "%2" enthalten, werden von diesem Dateisystem nicht unterst?tzt.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation>Dateinamen, die das Zeichen "%1" enthalten, werden von diesem Dateisystem nicht unterst?tzt.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>%1 Der Name enth?lt mindestens ein ung?ltiges Zeichen</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation>Ordnername enth?lt mindestens ein ung?ltiges Zeichen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>%1 Der Name ist in diesem Dateisystem ein reservierter Name.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>Der Dateiname enth?lt mindestens ein ung?ltiges Zeichen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation>Der Ordnername ist ein reservierter Name in diesem Dateisystem.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation>Der Dateiname ist ein reservierter Name auf diesem Dateisystem.</translation>
</message>
@@ -4081,6 +4156,24 @@
<translation>Dateiname enth?lt Leerzeichen am Ende.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Ordner</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Datei</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>%1 Namen, die das Zeichen "%2" enthalten, werden von diesem Dateisystem nicht unterst?tzt.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4089,6 +4182,16 @@
<translation>Kann nicht umbenannt oder hochgeladen werden.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>%1 Der Name enth?lt mindestens ein ung?ltiges Zeichen</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>%1 Der Name ist in diesem Dateisystem ein reservierter Name.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>Dateiname enth?lt Leerzeichen am Anfang.</translation>
@@ -4179,64 +4282,74 @@
<translation>Server meldet keine %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Synchronisierung wegen ung?ltiger ?nderungszeit nicht m?glich</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation>Hochladen von %1 ?bersteigt %2 des in den pers?nlichen Dateien verf?gbaren Speicherplatzes.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation>Hochladen von %1 ?bersteigt %2 des in dem Ordner %3 verf?gbaren Speicherplatzes.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>Datei konnte nicht hochgeladen werden, da sie in "%1" ge?ffnet ist.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
- <translation>Fehler beim L?schen des Dateisatzes %1 aus der Datenbank</translation>
+ <translation>Fehler beim L?schen des Dateidatensatzes %1 aus der Datenbank</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>Auf ung?ltiges Ziel verschoben, wiederherstellen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>Das verschl?sselte Element kann nicht ge?ndert werden, da das ausgew?hlte Zertifikat nicht g?ltig ist.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignoriert wegen der "Choose what to sync"-Blacklist</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Nicht erlaubt, da Sie nicht die Berechtigung haben, Unterordner zu diesem Ordner hinzuzuf?gen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Nicht erlaubt, da Sie keine Berechtigung zum Hinzuf?gen von Dateien in diesen Ordner haben.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgesch?tzt ist. Wiederherstellen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>Entfernen nicht erlaubt, wiederherstellen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Fehler beim Lesen der Datenbank</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>Der Server hat w?hrend des Lesens des Verzeichnisses "%1" mit einem Fehler geantwortet: %2</translation>
</message>
@@ -4244,38 +4357,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>Datei %1 konnte nicht aus der lokalen Datenbank gel?scht werden</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>Fehler beim Aktualisieren der Metadaten aufgrund einer ung?ltigen ?nderungszeit</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>Der Ordner %1 kann nicht schreibgesch?tzt werden: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>Unbekannter Ausnahmefehler</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Fehler beim Aktualisieren der Metadaten: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>Datei ist aktuell in Benutzung</translation>
</message>
@@ -4293,12 +4406,6 @@
<translation>Die Datei %1 kann nicht heruntergeladen werden, da die Verschl?sselungsinformationen fehlen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>Datei ist seit der Entdeckung ge?ndert worden</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4355,6 +4462,12 @@
<source>The file %1 is currently in use</source>
<translation>Die Datei %1 ist aktuell in Benutzung</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>Datei ist seit der Entdeckung ge?ndert worden</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4372,39 +4485,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>Konnte Datei %1 nicht l?schen. Fehler: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>Ordner %1 kann aufgrund einer lokalen Datei- oder Ordnernamenskollision nicht erstellt werden!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>Ordner %1 konnte nicht erstellt werden </translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>Der Ordner %1 kann nicht schreibgesch?tzt werden: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>Unbekannter Ausnahmefehler</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Fehler beim Aktualisieren der Metadaten: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>Die Datei %1 ist aktuell in Benutzung</translation>
</message>
@@ -4414,17 +4527,17 @@
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="105"/>
<source>Could not remove %1 because of a local file name clash</source>
- <translation>%1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht gel?scht werden</translation>
+ <translation>%1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht entfernt werden</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation>Vor?bergehender Fehler beim Entfernen eines vom Server entfernten lokalen Objekts.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Der Dateidatensatz %1 konnte nicht aus der lokalen Datenbank gel?scht werden</translation>
</message>
@@ -4432,49 +4545,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>Ordner %1 kann aufgrund einer lokalen Datei- oder Ordnernamenskollision nicht umbenannt werden!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>Datei %1 heruntergeladen, aber dies f?hrte zu einem lokalen Dateinamenskonflikt!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>Datei %1 konnte nicht aus der lokalen Datenbank abgerufen werden</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Fehler beim Setzen des PIN-Status</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Fehler beim Aktualisieren der Metadaten: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>Die Datei %1 ist aktuell in Benutzung</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>Die Umbenennung des Verzeichnisses in der Hierarchie konnte nicht weitergegeben werden</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
- <translation>Konnte Datei nicht umbenennen</translation>
+ <translation>Datei konnte nicht umbenannt werden</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Der Dateidatensatz %1 konnte nicht aus der lokalen Datenbank gel?scht werden</translation>
</message>
@@ -4531,39 +4644,39 @@
<translation>Konnte %1 nicht nach %2 umbenennen. Fehler: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Fehler beim Aktualisieren der Metadaten: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>Die Datei %1 ist aktuell in Benutzung</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Es wurde ein falscher HTTP-Status-Code vom Server gesendet. Erwartet wurde 201, aber gesendet wurde "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>Datei %1 konnte nicht aus der lokalen Datenbank abgerufen werden</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Der Dateidatensatz %1 konnte nicht aus der lokalen Datenbank gel?scht werden</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Fehler beim Setzen des PIN-Status</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
</message>
@@ -4571,22 +4684,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>Das Hochladen der verschl?sselten Datei ist fehlgeschlagen.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>Die Datei %1 kann nicht hochgeladen werden, da eine andere Datei mit dem selben Namen, nur unterschiedlicher Gro?-/Kleinschreibung, existiert</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>Das Hochladen von %1 ?berschreitet das Speicherkontingent des Ordners </translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4594,11 +4696,6 @@
<translation>Die Datei %1 hat eine ung?ltige ?nderungszeit. Nicht auf den Server hochladen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Datei entfernt (starte Hochladen) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Lokale Datei hat sich w?hrend der Synchronisierung ge?ndert. Die Synchronisierung wird wiederaufgenommen.</translation>
@@ -4611,7 +4708,7 @@
<message>
<location filename="../src/libsync/propagateupload.cpp" line="462"/>
<source>Failed to unlock encrypted folder.</source>
- <translation>Der verschl?sselte Ordner konnte nicht entsperrt werden.</translation>
+ <translation>Verschl?sselter Ordner konnte nicht entsperrt werden.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="735"/>
@@ -4628,13 +4725,29 @@
<source>The file %1 is currently in use</source>
<translation>Die Datei %1 ist aktuell in Benutzung</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>Das Hochladen von %1 ?berschreitet das Speicherkontingent des Ordners </translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>Verschl?sselte Datei konnte nicht hochgeladen werden.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Datei entfernt (starte Hochladen) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
<message>
<location filename="../src/libsync/propagateuploadng.cpp" line="458"/>
<source>The local file was removed during sync.</source>
- <translation>Die lokale Datei wurde w?hrend der Synchronisierung gel?scht.</translation>
+ <translation>Die lokale Datei wurde w?hrend der Synchronisierung entfernt.</translation>
</message>
<message>
<location filename="../src/libsync/propagateuploadng.cpp" line="473"/>
@@ -4672,7 +4785,7 @@
<message>
<location filename="../src/libsync/propagateuploadv1.cpp" line="260"/>
<source>The local file was removed during sync.</source>
- <translation>Die lokale Datei wurde w?hrend der Synchronisierung gel?scht.</translation>
+ <translation>Die lokale Datei wurde w?hrend der Synchronisierung entfernt.</translation>
</message>
<message>
<location filename="../src/libsync/propagateuploadv1.cpp" line="275"/>
@@ -4789,7 +4902,7 @@
<message>
<location filename="../src/gui/settingsdialog.cpp" line="244"/>
<source>Account</source>
- <translation>Benutzerkonto</translation>
+ <translation>Konto</translation>
</message>
</context>
<context>
@@ -4876,9 +4989,35 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Kontextmen? Freigabe</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Ich habe etwas mit Ihnen geteilt</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Freigabeoptionen</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Privaten Link als E-Mail verschicken ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Privater Link in die Zwischenablage kopiert</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
- <translation>Fehler beim Verschl?sseln des Ordners unter "%1"</translation>
+ <translation>Ordner unter "%1" konnte nicht verschl?sselt werden</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="552"/>
@@ -4902,17 +5041,12 @@
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="579"/>
<source>Folder encrypted successfully</source>
- <translation>Ordner erfolgreich verschl?sselt</translation>
+ <translation>Ordner verschl?sselt</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="580"/>
<source>The following folder was encrypted successfully: "%1"</source>
- <translation>Der folgende Ordner wurde erfolgreich verschl?sselt: "%1"</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Kontextmen? Freigabe</translation>
+ <translation>Der folgende Ordner wurde verschl?sselt: "%1"</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
@@ -4920,33 +5054,12 @@
<translation>Neuen Ort ausw?hlen ?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Ich habe etwas mit Ihnen geteilt</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Freigabeoptionen</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Aktivit?t</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Privater Link in die Zwischenablage kopiert</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Privaten Link als E-Mail verschicken ?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>Freigabe verlassen</translation>
@@ -4962,11 +5075,6 @@
<translation>Weiterteilen dieses Ordners ist nicht erlaubt</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Internen Link kopieren</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>Verschl?sseln</translation>
@@ -4993,12 +5101,6 @@
<translation><numerusform>L?uft ab in %1 Minute</numerusform><numerusform>L?uft ab in %1 Minuten</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Im Browser ?ffnen</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Konflikt l?sen?</translation>
@@ -5028,6 +5130,17 @@
<source>Delete</source>
<translation>L?schen</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Internen Link kopieren</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Im Browser ?ffnen</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5129,13 +5242,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Diese Verbindung ist NICHT sicher, da diese nicht verschl?sselt ist.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Serverversion: %1</translation>
@@ -5155,6 +5261,13 @@
<source>The connection is not secure</source>
<translation>Die Verbindung ist nicht sicher</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Diese Verbindung ist NICHT sicher, da diese nicht verschl?sselt ist.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5247,6 +5360,32 @@
<translation>%1 (?bersprungen aufgrund des fr?heren Fehlers, erneuter Versuch in %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Nur %1 sind verf?gbar. Zum Beginnen werden mindestens %2 ben?tigt.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>?ffnen oder erstellen der Sync-Datenbank nicht m?glich. Bitte sicherstellen, dass Schreibrechte f?r den zu synchronisierenden Ordner existieren.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Der freie Speicherplatz wird knapp: Downloads, die den freien Speicher unter %1 reduzieren, wurden ausgelassen.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>Auf dem Server ist f?r einige Dateien zum Hochladen nicht genug Platz.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Ungel?ster Konflikt.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>Datei konnte nicht aktualisiert werden: %1</translation>
@@ -5264,23 +5403,7 @@
<message>
<location filename="../src/libsync/syncengine.cpp" line="433"/>
<source>Could not set file record to local DB: %1</source>
- <translation>Dateidatensatz konnte nicht auf lokale DB gesetzt werden: %1</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Ungel?ster Konflikt.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Nur %1 sind verf?gbar. Zum Beginnen werden mindestens %2 ben?tigt.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>?ffnen oder erstellen der Sync-Datenbank nicht m?glich. Bitte sicherstellen, dass Schreibrechte f?r den zu synchronisierenden Ordner existieren.</translation>
+ <translation>Der Dateidatensatz konnte nicht in die lokale Datenbank eingestellt werden: %1</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
@@ -5302,16 +5425,6 @@
<source>Cannot open the sync journal</source>
<translation>Synchronisierungsprotokoll kann nicht ge?ffnet werden</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Der freie Speicherplatz wird knapp: Downloads, die den freien Speicher unter %1 reduzieren, wurden ausgelassen.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>Auf dem Server ist f?r einige Dateien zum Hochladen nicht genug Platz.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5322,7 +5435,7 @@
<translation>Offline</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>Die Nutzungsbedingungen m?ssen best?tigt werden</translation>
</message>
@@ -5501,7 +5614,7 @@
<message>
<location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="416"/>
<source>Failed to fetch search providers for '%1'. Error: %2</source>
- <translation>Konnte Suchanbieter f?r '%1' nicht abrufen. Fehler: %2</translation>
+ <translation>Suchanbieter f?r '%1' konnte nicht abgerufen werden. Fehler: %2</translation>
</message>
<message>
<location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="450"/>
@@ -5519,7 +5632,7 @@
<message>
<location filename="../src/libsync/updatee2eefoldermetadatajob.cpp" line="132"/>
<source>Failed to update folder metadata.</source>
- <translation>Fehler beim Aktualisieren der Ordner-Metadaten.</translation>
+ <translation>Ordner-Metadaten konnten nicht aktualisiert werden</translation>
</message>
<message>
<location filename="../src/libsync/updatee2eefoldermetadatajob.cpp" line="155"/>
@@ -5529,7 +5642,7 @@
<message>
<location filename="../src/libsync/updatee2eefoldermetadatajob.cpp" line="165"/>
<source>Failed to finalize item.</source>
- <translation>Fehler beim Fertigstellen des Elements.</translation>
+ <translation>Element konnte nicht fertiggestellt werden</translation>
</message>
</context>
<context>
@@ -5565,7 +5678,7 @@
<message>
<location filename="../src/libsync/updatee2eefolderusersmetadatajob.cpp" line="238"/>
<source>Failed to unlock a folder.</source>
- <translation>Fehler beim Entsperren eines Ordners.</translation>
+ <translation>Ordner konnte nicht entsperrt werden</translation>
</message>
</context>
<context>
@@ -5604,7 +5717,7 @@
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1082"/>
<source>Open Nextcloud Assistant in browser</source>
- <translation>Nextcloud-Assistent im Browser ?ffnen</translation>
+ <translation>Nextcloud Assistant im Browser ?ffnen</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1082"/>
@@ -5706,11 +5819,6 @@
<source>Less than a minute</source>
<translation>Weniger als eine Minute</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation><numerusform>%n Minute</numerusform><numerusform>%n Minuten</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5718,20 +5826,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation><numerusform>%n Stunde</numerusform><numerusform>%n Stunden</numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1 Minute</numerusform><numerusform>%1 Minuten</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation><numerusform>%n Tag</numerusform><numerusform>%n Tage</numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1 Stunde</numerusform><numerusform>%1 Stunden</numerusform></translation>
@@ -5746,6 +5844,21 @@
<source>%1 days</source>
<translation><numerusform>%1 Tag</numerusform><numerusform>%1 Tage</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation><numerusform>%n Minute</numerusform><numerusform>%n Minuten</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n Stunde</numerusform><numerusform>%n Stunden</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n Tag</numerusform><numerusform>%n Tage</numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5888,6 +6001,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Bitte melden Sie sich an</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>Es wurden keine Synchronisierungsordner konfiguriert.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Von %1 getrennt</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Nicht unterst?tze Serverversion</translation>
@@ -5908,31 +6036,6 @@
<translation>F?r Ihr Konto %1 m?ssen Sie die Nutzungsbedingungen Ihres Servers akzeptieren. Sie werden weitergeleitet an %2, um zu best?tigen, dass Sie die Nutzungsbedingungen gelesen haben und damit einverstanden sind.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Von %1 getrennt</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Verbindungen zu Konten getrennt:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Konto %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Bitte melden Sie sich an</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Konto-Synchronisierung ist deaktiviert</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5954,11 +6057,6 @@
<translation>macOS VFS f?r %1: Es ist ein Problem aufgetreten.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>Es wurden keine Synchronisierungsordner konfiguriert.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Nach ?nderungen in entfernten "%1" suchen</translation>
@@ -5969,6 +6067,21 @@
<translation>Nach ?nderungen in lokalem "%1" suchen</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Verbindungen zu Konten getrennt:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Konto %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Konto-Synchronisierung ist deaktiviert</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5977,11 +6090,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Lokaler Ordner</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Benutzername</translation>
@@ -6017,22 +6125,11 @@
<translation>Fragen, bevor Ordner synchronisiert werden. Grenze:</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Fragen, bevor externe Speicher synchronisiert werden</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Zu synchronisierende Elemente ausw?hlen</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Lokale Daten behalten</translation>
@@ -6047,6 +6144,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Lokalen Ordner l?schen und eine saubere Synchronisierung starten</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Zu synchronisierende Elemente ausw?hlen</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Lokaler Ordner</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6087,6 +6200,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>in der Zukunft</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1m</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>jetzt</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Vor einiger Zeit</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6095,7 +6253,7 @@
<message>
<location filename="../src/gui/generalsettings.cpp" line="133"/>
<source>Failed to create debug archive</source>
- <translation>Fehler beim Erstellen des Debug-Archivs</translation>
+ <translation>Debug-Archiv konnte nicht erstellt werden</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.cpp" line="134"/>
@@ -6127,57 +6285,12 @@
<source>Synced %1</source>
<translation>%1 synchronisiert</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>in der Zukunft</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>jetzt</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1m</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Vor einiger Zeit</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation>Fehler beim L?schen der Datei</translation>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>Pfade, die mit dem Zeichen '#' beginnen, werden im VFS-Modus nicht unterst?tzt.</translation>
@@ -6370,7 +6483,7 @@
<message>
<location filename="../src/common/syncjournaldb.cpp" line="981"/>
<source>Failed to connect database.</source>
- <translation>Fehler beim Verbinden mit der Datenbank.</translation>
+ <translation>Verbindung zur Datenbank fehlgeschlagen</translation>
</message>
</context>
<context>
@@ -6423,6 +6536,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>Lokale Ordner oder Gruppen-Ordner ?ffnen</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Lokalen Ordner ?ffnen</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Verbunden</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>Getrennt</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>Lokalen Ordner "%1" ?ffnen</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>Gruppenordner "%1" ?ffnen</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>"%1" im Dateiexplorer ?ffnen</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>Men? f?r Benutzergruppen und lokale Ordner</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6538,7 +6694,7 @@
<message>
<location filename="../src/gui/tray/UserLine.qml" line="179"/>
<source>Remove account</source>
- <translation>Konto l?schen</translation>
+ <translation>Konto entfernen</translation>
</message>
</context>
<context>
@@ -6612,16 +6768,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6636,6 +6782,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6869,16 +7025,16 @@
<translation>Fehler bei der Einrichtung aufgetreten</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Synchronisierung wird vorbereitet</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>Beende Synchronisierung</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Synchronisierung wird vorbereitet</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Synchronisierung ist angehalten.</translation>
@@ -6937,4 +7093,17 @@
<translation>Lokalen Speicherplatz freigeben</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>Schnelle Synchronisierung aktivieren</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>Bei der schnellen Synchronisierung werden nur ?nderungen an Dateien und Ordnern innerhalb der Ordner synchronisiert, die bereits untersucht wurden. Dies kann die Reaktionsf?higkeit bei der Ersteinrichtung virtueller Dateien erheblich erh?hen. Allerdings f?hrt dies zu redundanten Downloads von Dateien, die in einen noch nicht erfassten Ordner verschoben wurden.</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_el.ts nextcloud-desktop-3.16.6/translations/client_el.ts
--- nextcloud-desktop-3.16.4/translations/client_el.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_el.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
@@ -570,7 +562,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>????? ???????????: ...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>?? ?? ??????????? ??????? ?? <b>??????????</ b> ??? ?? ?????? ??????? ??????? ??? ??? ??? ?? ????????????? ??? ?? ????? ??? ??????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>?????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>????????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>???????????? ?? ?? <server> ?? <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>???????????? ????</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>????? ???????????: ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>???????????? ?? ?? <server> ?? <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>??? ?????????? ???????????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation type="unfinished"/>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>??? ?????????? ???????????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation>???????? ??????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation type="unfinished"/>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -731,12 +739,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>??????? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>?????????????</translation>
@@ -775,16 +777,6 @@
<translation>???????????? ????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>???????? ????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>????? ????????????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>???????? ???????????? ???????</translation>
@@ -810,21 +802,11 @@
<translation>???????? ??????????? ???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>???????? ??????????? ??????? ??????? <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>??????????? ????????? ????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>?????? ?????????? ?? ??????????? ?? ??????????? ??? ??????? <i>%1</i>;</p><p><b>????????:</b> ???? <b>???</b> ?? ????????? ?????? ??????.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>???????? ????????????</translation>
@@ -854,23 +836,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>?????????????? ?????????????? ??? ???? ?? ????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -884,34 +866,44 @@
<translation>? ?????????? ???????????? ??????????.<br/> ?????? ?? ??? ???????????;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) ??? %2 ?? ?????. ??????? ???????, ??????????????????? ??? ????????? ? ??? ???????????? ?????? ?? ????? ??????????? ????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 ?? ?????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 ??? %2 ?? ?????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>???? ?? ????? ??? ???????? ??????????? ?????? ????? ??????????? ??????????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 ?? ?????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>? ?????? %1 ??? ?????????? ??? ?????????????! ????????? ?? ???? ??? ??????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>? ??????????? ??????????? ????????????? ??? ???? ?? ????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -929,80 +921,126 @@
<translation>? ??????????? %1 ????????? ???? ?? ????????? ??????????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>???????????? ??? %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>??????? ?? %1 '...'</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>???????? ??????? ??? ??? ?????????????? ?????? ????? ???? ???????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>???????? ??????? ??? ??? ?????????????? ?????? ????? ?????????? ????????????? ?????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>?????? ????????? ??????????: %1 ?? %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>???????? ??????? ??? ??? ?????????????? ?????? ????? ???? ??????? ? ????????????? ?????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>??????? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>???????? ????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>????? ????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>???????? ??????????? ??????? ??????? <i>%1</i>.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>?????? ?????????? ?? ??????????? ?? ??????????? ??? ??????? <i>%1</i>;</p><p><b>????????:</b> ???? <b>???</b> ?? ????????? ?????? ??????.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>??? ???? ????????? ??????? ?? ?? %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>?????????????? ?????????????? ??? ???? ?? ????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>???????? ??????? ??? ??? ?????????????? ?????? ????? ???? ???????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>???????? ??????? ??? ??? ?????????????? ?????? ????? ?????????? ????????????? ?????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) ??? %2 ?? ?????. ??????? ???????, ??????????????????? ??? ????????? ? ??? ???????????? ?????? ?? ????? ??????????? ????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>???????? ??????? ??? ??? ?????????????? ?????? ????? ???? ??????? ? ????????????? ?????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 ??? %2 ?? ?????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>???? ?? ????? ??? ???????? ??????????? ?????? ????? ??????????? ??????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>? ?????? %1 ??? ?????????? ??? ?????????????! ????????? ?? ???? ??? ??????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>? ??????????? ??????????? ????????????? ??? ???? ?? ????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>??????? ?? %1 '...'</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>?????? ????????? ??????????: %1 ?? %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>??? ???? ????????? ??????? ?? ?? %1.</translation>
+ </message>
</context>
<context>
<name>OCC::AccountSetupFromCommandLineJob</name>
@@ -1116,11 +1154,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>?????????...</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>??????? ??????????????:</translation>
@@ -1131,6 +1164,11 @@
<translation>?????????? ??????? ??? ??????????????? ????? pkcs12, ????? ??? ????????? ?? ??????????? ??? ?????? ???????????.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>?????????...</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>???????? ??? ?????????????.</translation>
@@ -1181,46 +1219,46 @@
<translation>????????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>?????? ????????? ??? ?????? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation type="unfinished"/>
</message>
@@ -1262,6 +1300,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1269,6 +1346,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
@@ -1473,7 +1555,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>?????? ???????? ????????????? ???? ???? ?????????</translation>
</message>
@@ -1603,21 +1685,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>?????? ?? ?????????? ???????? ??? ???????? <i>%1</i> ??? ??? ?? ??????????? ???;</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>?????? ?? ?????????? ?????? ?? ?????? <i>%</i>;</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>??????????? ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1633,30 +1700,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>??? ???? ????????? ??????????? Nextcloud</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>?????? ?? ?????????? ???????? ??? ???????? <i>%1</i> ??? ??? ?? ??????????? ???;</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>?????? ????????????: ?? ????? ?????? ? ? ??????? ????????? ????? ??????????.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>?????? ?? ?????????? ?????? ?? ?????? <i>%</i>;</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>??????????? ?????????</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>???? ??????</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>?? ?????????? ?????????????? ??? ????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>? ??????????? ??????????? ??? ???? ?? ????? ????? ???? ??????</translation>
@@ -1666,16 +1733,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>???????? ?????????? ?? ?????????? ??? ??????? ?????? ??? ????????????? ?? ?????.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>?????? ????????????: ?? ????? ?????? ? ? ??????? ????????? ????? ??????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>??? ???? ????????? ??????????? Nextcloud</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>?? ?????????? ?????????????? ??? ????? ?????</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation type="unfinished"/>
</message>
@@ -1683,19 +1765,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>?????? ??????????: ? ???????? PROPFIND ??? ???? ??????????? XML!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1703,27 +1785,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>?????? ???? ?? ??????? ??? ????????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>? ????????? ??? ????? ??????????? ???? ??????, ???????????? ? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>? ????????? ??? ???????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>? ???????????? ??? ???????? ??????? ??? ????? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>?????? ???? ??? ???????? ??? ????????? %1</translation>
</message>
@@ -1963,11 +2045,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
@@ -1979,28 +2056,33 @@
<translation>? ??????????? ????????? ??????: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>?????? ?????? ???? ??? ???????? ??? "?????????????": <br><em> %1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>??? ???? ?????? ? ??????? ??? JSON ??? ?? ??????????: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>? ???????? ??? ?????????? ??? ???????? ??? ?? ??????????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>??? ???? ?????? ? ??????? ??? JSON ??? ?? ??????????: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2043,6 +2125,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>?? %1 ??????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>?? %1 ???? ??????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>?? %1 ???? ???????????? ?? %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>?? %1 ???? ??????????? ??? %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2058,17 +2168,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 ???%n ???o ?????o(?) ????? ??????????.</numerusform><numerusform>%1 ???%n ???o ?????o(?) ????? ??????????.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>?? %1 ??????????.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>????? ????????? %1 ??? %n ???? ??????(?).</numerusform><numerusform>????? ????????? %1 ??? %n ???? ??????(?).</numerusform></translation>
@@ -2084,33 +2183,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 ???%n ???? ??????(?) ????? ??????????.</numerusform><numerusform>%1 ???%n ???? ??????(?) ????? ??????????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>?? %1 ???? ??????????.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ????????????? ?? %2 ??? %n ???? ??????(?) ????? ????????????.</numerusform><numerusform>%1 ????????????? ?? %2 ??? %n ???? ??????(?) ????? ????????????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>?? %1 ???? ???????????? ?? %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 ???? ??????????? ?? %2 ??? %n ???o ??????(?) ????? ???????????.</numerusform><numerusform>%1 ???? ??????????? ?? %2 ??? %n ???o ??????(?) ????? ???????????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>?? %1 ???? ??????????? ??? %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2147,67 +2229,67 @@
<translation>????????????? ????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>???????? ????????? ??????? ??????????? ??????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>?????????? ???? ???? ??????? ??????????? ??? %1 MB: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>?????????? ???? ??????? ??? ????????? ???????????? ????.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>????????? ???? ????????? ??? ?? ?? ????????? ??? ?????????? ?? ?? ??????????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>? ??????? %1 ??? ????????????? ???? ????????? ??? ??? ???????????. ?? ???????? ??? ??? ?? ?????????????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>?? ?????? %1 ??? ????????????? ???? ????????? ??? ??? ???????????. ??? ?? ???????????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2218,41 +2300,41 @@
???? ???????? ??? ? ???????? ??? ?? ???????? ??? ??????? ??????? ?????, ?? ??????? ???? ??? ??????? ??????? ??? ?? ??? ???????? ????????? (???? ??? ???? ??? ??????????).</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2293,11 +2375,6 @@
<translation>??? ???? ?????? ?? ??????????? ? ????????? ??? ???????</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>??????? ??? ?????????? ?????? ???????????? "%1", ???? ??? ??????? ?? ?????????. ??????????? ??????????? ??? ????? ???????? ??? ?? ???????????? ???? ?? ??????.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(????????? ?????????)</translation>
@@ -2308,6 +2385,11 @@
<translation>(????????? ????????? %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>??????? ??? ?????????? ?????? ???????????? "%1", ???? ??? ??????? ?? ?????????. ??????????? ??????????? ??? ????? ???????? ??? ?? ???????????? ???? ?? ??????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation type="unfinished"/>
@@ -2378,16 +2460,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>????? ????????????.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (????? ????????????)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2434,6 +2506,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>????? ????????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (????? ????????????)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2477,16 +2559,6 @@
<translation>?????? ???? ?? ??????? ??? ?????? ??????? ??? ?? ??????????.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>???? ?????? ??????? ?????????? '...'</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>???????? ?? ?????????? ???????????. ??????? ??? ??? ????????????.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>? ???????? ?????????? ??????? ????? ??????????????.</translation>
@@ -2528,16 +2600,31 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>???????? ?? ?????????? ???????????. ??????? ??? ??? ????????????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation type="unfinished"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>???? ?????? ??????? ?????????? '...'</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2584,21 +2671,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 ??? %2, ?????? %3 ??? %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>??????? ??? %n ???????(?)</numerusform><numerusform>??????? ??? %n ???????(?)</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>??????? ??? %n ???????(?)</numerusform><numerusform>??????? ??? %n ???????(?)</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2758,11 +2840,6 @@
<translation>??????? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&?????? ???? ??? ???????? ??????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation type="unfinished"/>
@@ -2773,11 +2850,6 @@
<translation>??? ?? </translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>????? &?????????? ??????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2793,17 +2865,32 @@
<translation>??? ?????????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>??</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>??????? ??????????? ???? ??? ??????????? ?????????? ????????????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&?????? ???? ??? ???????? ??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>????? &?????????? ??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2814,11 +2901,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>??????? ??????????? ???? ??? ??????????? ?????????? ????????????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2870,11 +2952,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&???????????? && ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation type="unfinished"/>
@@ -2895,6 +2972,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&???????????? && ?????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>???????????? ??? ??? ?????????? ??? ???????? ??? ??????? ???.</translation>
@@ -2915,6 +3002,11 @@
<translation>??? ???????? ?? ???????????????? ??? ???????? ???????? ?????? ????? ?????????????? ? ???????? ???????? ?? ??? ?? ???????.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>????????</translation>
@@ -2989,6 +3081,11 @@
<source>Debug archive is created at %1</source>
<translation>?? ?????? ?????????? ????????? ????????????? ??? % 1.</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3153,102 +3250,97 @@
<translation>??? ????? ???????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>??????????? ???????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>??? ????? ?? ?????????? ?????????? ??? ?? ??????????? ??? ???????. ??????????? ??????? ??? ?????? ??? ??????? ?? ?? ???????????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>?? ????? ??????? ???????? ?? ?????????? ??????????: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>??? ????? ?????? ? ??????????? ??? ???????. ??????????? ??????? ?? ??????? ??? ?? ?? ??????????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>??? ????? ?????? ? ??????????? ??? ??????? ????? ??????????????? ??? ??? ??????????. ??????????? ???????? ???????????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation type="unfinished"/>
</message>
@@ -3370,16 +3462,6 @@
<translation><p>??? ??? ?????? ??? %1 ????? ????? ?????????.</p><p><b>%2</b> ????? ????????? ??? ????. ? ????????????? ?????? ????? %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>????????? ???? ?? ????</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>???? ??????????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>? ????????? ???????.</translation>
@@ -3404,6 +3486,16 @@
<source>Update manually</source>
<translation>?? ???????? ?????????.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>????????? ???? ?? ????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>???? ??????????</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3428,6 +3520,23 @@
<translation>? ?????????????? ??????? ???????????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>???????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>??????????? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>????????: ?? ????????? ????????????? ??? ????? ???????????? ??? ???????????? ??? localhost.</translation>
@@ -3450,46 +3559,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>???????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>????? ????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>??????????? ??</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>??????????? ??? 3/4 ??? ??????????? ????????? ????????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>???????? ????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>????????? ???????????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>???????? ????????????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>????? ?????????? ??? ?????????????</translation>
@@ -3518,6 +3610,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>???????? ??????? ??? ???? ???????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>??????? ?????????? ??????????? '...'</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation type="unfinished"/>
@@ -3548,11 +3650,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>???????? ??????? ??? ???? ???????????.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation type="unfinished"/>
@@ -3563,16 +3660,21 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>??????? ?????????? ??????????? '...'</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>? ????????? ?????????? ????? ???????: ??? ????? ??????? ??? ??? ???? ???????????.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>??? ???????? ??????????? ??????????. ? ??????????? ??? ????????? ???? ????????? ??????.</translation>
@@ -3748,11 +3850,6 @@
<translation><font color="green">???????? ??????? ??? %1: %2 ?????? %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>?? ?????? URL</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>???????? ???????? ?? ?? %1 ??? %2:<br/>%3</translation>
@@ -3763,6 +3860,16 @@
<translation>???? ???????? ????? ???? ?? ??????? ?? %1 ?? %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>?????????? ????????? ??? ??? ??????????. ??? ?? ????????????? ??? ????? ?????????? ?????????, <a href="%1">??????? ???</a> ??? ?? ???????????? ??? ???????? ?? ?? ????????? ????????? ???.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>?? ?????? URL</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>?????????? ???????? ??? %1 ??? %2 '...'</translation>
@@ -3773,11 +3880,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>?????????? ????????? ??? ??? ??????????. ??? ?? ????????????? ??? ????? ?????????? ?????????, <a href="%1">??????? ???</a> ??? ?? ???????????? ??? ???????? ?? ?? ????????? ????????? ???.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>?????? ?? ?????? ???????? ?? ????????????? ?????? WebDAV</translation>
@@ -3983,62 +4085,34 @@
<translation>?? ??????? ??????? ??? ?????????? ?? ?????? ??? ?????????????? ?? ???? ?? ??????? ???????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>?? ????? ??????? ???????? ??????????? ???? ?? ?????? ?????????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4048,6 +4122,24 @@
<translation>?? ????? ??????? ???????? ???? ??????????.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4056,6 +4148,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
@@ -4146,64 +4248,74 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>???????????? ?? ?? ?????? ?????, ?????????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>????????? ???? ??? ?????? ?????? "???????? ?? ?? ????????????".</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>??? ??????????? ?????? ??? ????? ????? ?? ?????????? ??????????? ?? ????? ?? ??????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>??? ??????????? ?????? ??? ????? ????? ?? ?????????? ???????? ?? ????? ?? ??????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>??? ??????????? ? ??????????? ????? ??? ??????? ?????? ????? ???? ??? ???????? ???? ??????????, ??????? ?????????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>??? ??????????? ? ?????????, ?????????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>?????? ???? ??? ???????? ??? ????? ?????????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation type="unfinished"/>
</message>
@@ -4211,38 +4323,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>?? ?????? ??????????????? ????? ?? ??????</translation>
</message>
@@ -4260,12 +4372,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>?? ?????? ???? ??????? ??? ???? ????????????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4322,6 +4428,12 @@
<source>The file %1 is currently in use</source>
<translation>?? ?????? %1 ??????????????? ????? ?? ??????</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>?? ?????? ???? ??????? ??? ???? ????????????</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4339,39 +4451,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>???????? ????????? ??????? %1, ??????: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>???????? ??????????? ???????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>?????? ?????????? ?????????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>?? ?????? %1 ??????????????? ????? ?? ??????</translation>
</message>
@@ -4384,14 +4496,14 @@
<translation>??? ???? ?????? ? ???????? ??? %1 ???? ???????? ?? ?? ????? ???? ??????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4399,49 +4511,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>?????? ???????? ??? ?????????? pin</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>?????? ?????????? ?????????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>?? ?????? %1 ??????????????? ????? ?? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>???????? ???????????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4498,39 +4610,39 @@
<translation>??? ???? ?????? ? ??????????? % 1 ?? %2, ??????: %3.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>?????? ?????????? ?????????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>?? ?????? %1 ??????????????? ????? ?? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>? ??????????? ????????? ????????? ?????? HTTP. ?????????? 201, ???? ?????? "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>?????? ???????? ??? ?????????? pin</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>?????? ???????? ????????????? ???? ???? ?????????</translation>
</message>
@@ -4538,22 +4650,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>? ??????????? ??? ???????????????? ??????? ???????.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>?? ?????? % 1 ??? ?????? ?? ?????? ?????? ??????? ??? ???? ?????? ?? ?? ???? ?????, ??? ???????? ???? ??? ?????????,</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>? ??????????? ??? %1 ?????????? ?? ???? ??? ???????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4561,11 +4662,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>?? ?????? ?????????? (?????? ????????????) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>?? ?????? ?????? ????????????? ???? ?? ???????? ??? ????????????. ?? ???????????? ????.</translation>
@@ -4595,6 +4691,22 @@
<source>The file %1 is currently in use</source>
<translation>?? ?????? %1 ??????????????? ????? ?? ??????</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>? ??????????? ??? %1 ?????????? ?? ???? ??? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>? ??????????? ??? ???????????????? ??????? ???????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>?? ?????? ?????????? (?????? ????????????) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4843,6 +4955,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>???????????? ????????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>?????????? ???? ???? ???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>???????? ?????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>???????? ????????? ????????? ?? ????????????...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>????????? ????????? ????????? ??? ????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4875,43 +5013,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>???????????? ????????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>???????? ??? ??????????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>?????????? ???? ???? ???</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>???????? ?????? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>????????? ????????? ????????? ??? ????????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>???????? ????????? ????????? ?? ????????????...</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4927,11 +5039,6 @@
<translation>??? ??????????? ? ????????????? ????? ??? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>????????? ?????????? ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -4958,12 +5065,6 @@
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>??????? ???? ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>??????? ?????????</translation>
@@ -4993,6 +5094,17 @@
<source>Delete</source>
<translation>????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>????????? ?????????? ?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>??????? ???? ?????????</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5094,13 +5206,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>???? ? ??????? ??? ????? ??????? ????? ??? ????? ???????????????.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>?????? ??????????: %1</translation>
@@ -5120,6 +5225,13 @@
<source>The connection is not secure</source>
<translation>? ??????? ??? ????? ???????</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>???? ? ??????? ??? ????? ??????? ????? ??? ????? ???????????????.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5212,6 +5324,32 @@
<translation>%1 (????????? ???? ???????????? ??????, ??????? ?????????? ?? %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>???? %1 ????? ?????????, ??????????? ??????????? %2 ??? ??? ????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>??????????? ??? ??????? ? ??? ?????????? ??? ??????? ????? ?????????. ???????? ?? ????? ?????????? ???????? ??? ?????? ????????????. </translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>? ????? ?????? ????? ???????: ?? ?????? ??? ?? ???????? ??? ???????? ???? ???? ??? %1 ?? ?????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>?? ??????? ?????????? ????? ???? ?????????? ??? ??????? ?????????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>?????? ?????????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>???????? ?????????? ???????: %1.</translation>
@@ -5232,22 +5370,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>?????? ?????????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>???? %1 ????? ?????????, ??????????? ??????????? %2 ??? ??? ????????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>??????????? ??? ??????? ? ??? ?????????? ??? ??????? ????? ?????????. ???????? ?? ????? ?????????? ???????? ??? ?????? ????????????. </translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>????? ????????? ??????? ?? ????????, ???? ? ???????? ??? ???? ???????.</translation>
@@ -5267,16 +5389,6 @@
<source>Cannot open the sync journal</source>
<translation>???????? ?????????? ??? ??????? ????????????</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>? ????? ?????? ????? ???????: ?? ?????? ??? ?? ???????? ??? ???????? ???? ???? ??? %1 ?? ?????????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>?? ??????? ?????????? ????? ???? ?????????? ??? ??????? ?????????????.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5287,7 +5399,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5671,11 +5783,6 @@
<source>Less than a minute</source>
<translation>???????? ??? ??? ?????</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5683,20 +5790,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5711,6 +5808,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5853,6 +5965,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>??????? ??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>??? ????? ????????? ??????? ????????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>???????????? ??? %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>?? ?????????????? ?????? ??????????</translation>
@@ -5873,31 +6000,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>???????????? ??? %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>???????????? ??? ???? ????????????:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>??????????? %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>??????? ??????????</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>? ??????????? ???????????? ???? ???????????????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5919,11 +6021,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>??? ????? ????????? ??????? ????????????.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation type="unfinished"/>
@@ -5934,6 +6031,21 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>???????????? ??? ???? ????????????:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>??????????? %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>? ??????????? ???????????? ???? ???????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5942,11 +6054,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&??????? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation type="unfinished"/>
@@ -5982,22 +6089,11 @@
<translation>?? ???????? ??????????? ???? ??? ??????????? ??????? ??????????? ???</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>??</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>?? ???????? ??????????? ??????????? ???? ??? ??????????? ?????????? ????????????? ?????</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>???????? ?? ?? ????????????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>????????? ??????? ?????????</translation>
@@ -6012,6 +6108,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>???????? ??????? ??????? ??? ???????? ??????? ????????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>???????? ?? ?? ????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&??????? ???????</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6052,6 +6164,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>??? ??????</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>????</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>???? ??? ????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6092,57 +6249,12 @@
<source>Synced %1</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>??? ??????</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>????</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>???? ??? ????</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6388,6 +6500,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6577,16 +6732,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6601,6 +6746,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6834,16 +6989,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>???????????? ??? ???????????</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>???????????? ??? ???????????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>????? ????????????</translation>
@@ -6902,4 +7057,17 @@
<translation>????????????? ?????? ????</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_en_GB.ts nextcloud-desktop-3.16.6/translations/client_en_GB.ts
--- nextcloud-desktop-3.16.4/translations/client_en_GB.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_en_GB.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>Enable fast sync</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>Enable virtual files</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation>Allow deletion of items in Trash</translation>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -558,7 +550,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Legacy import</translation>
</message>
@@ -573,7 +565,7 @@
<translation>Skip</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>Could not import accounts from legacy client configuration.</translation>
</message>
@@ -581,33 +573,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Storage space: ?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronised to this computer any more</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Cancel</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Apply</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Connected with <server> as <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Synchronise all</translation>
@@ -638,6 +608,33 @@
<translation>Connection settings</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Apply</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Storage space: ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Cancel</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Connected with <server> as <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>No account configured.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>End-to-end Encryption with Virtual Files</translation>
@@ -672,9 +669,9 @@
<b>This process is not reversible. Are you sure you want to proceed?</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>No account configured.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation>Forget encryption setup</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -687,6 +684,11 @@
<translation>Display mnemonic</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>End-to-end encryption has been enabled for this account</translation>
@@ -712,6 +714,13 @@
<translation>The folder has a sync error. Encryption of this folder will be possible once it has synced successfully</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -736,12 +745,6 @@
<translation>Could not encrypt folder because the folder does not exist anymore</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Open folder</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Encrypt</translation>
@@ -780,16 +783,6 @@
<translation>Restart sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Resume sync</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Pause sync</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Remove folder sync connection</translation>
@@ -815,21 +808,11 @@
<translation>Folder creation failed</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Could not create local folder <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirm Folder Sync Connection Removal</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Remove Folder Sync Connection</translation>
@@ -863,24 +846,24 @@
<translation>End-to-end encryption mnemonic</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>Disable end-to-end encryption</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation>Forget the end-to-end encryption on this device</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>Disable end-to-end encryption for %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation>Do you want to forget the end-to-end encryption settings for %1 on this device?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -893,34 +876,44 @@
<translation>The syncing operation is running.<br/>Do you want to terminate it?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 in use</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 of %2 in use</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>Migrate certificate to a new one</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Currently there is no storage usage information available.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>There are folders that have grown in size beyond %1MB: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 in use</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 as %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>The server version %1 is unsupported! Proceed at your own risk.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation>This account supports end-to-end encryption, but it needs to be set up first.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Set up encryption</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>This account supports end-to-end encryption</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -938,79 +931,125 @@
<translation>Server %1 is currently in maintenance mode.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>Server %1 is currently being redirected, or your connection is behind a captive portal.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Signed out from %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Connecting to %1 ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>There are folders that were not synchronised because they are too big: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>Unable to connect to %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>There are folders that were not synchronised because they are external storages: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Server configuration error: %1 at %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>There are folders that were not synchronised because they are too big or external storages: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>You need to accept the terms of service at %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Open folder</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>No %1 connection configured.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Resume sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>Migrate certificate to a new one</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Pause sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>There are folders that were not synchronised because they are too big: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Could not create local folder <i>%1</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>There are folders that were not synchronised because they are external storages: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>There are folders that were not synchronised because they are too big or external storages: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>There are folders that have grown in size beyond %1MB: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>Disable end-to-end encryption</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>Disable end-to-end encryption for %1?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>This account supports end-to-end encryption</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Set up encryption</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 of %2 in use</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Currently there is no storage usage information available.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 as %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>The server version %1 is unsupported! Proceed at your own risk.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>Server %1 is currently being redirected, or your connection is behind a captive portal.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Connecting to %1 ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>Unable to connect to %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Server configuration error: %1 at %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>You need to accept the terms of service at %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>No %1 connection configured.</translation>
</message>
</context>
<context>
@@ -1125,11 +1164,6 @@
<translation>Certificate & Key (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Browse ?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Certificate password:</translation>
@@ -1140,6 +1174,11 @@
<translation>An encrypted pkcs12 bundle is strongly recommended as a copy will be stored in the configuration file.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Browse ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Select a certificate</translation>
@@ -1190,34 +1229,34 @@
<translation>Continue</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 accounts</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 account</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 folders</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 folder</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Legacy import</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1225,12 +1264,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Error accessing the configuration file</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</translation>
</message>
@@ -1272,6 +1311,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation>File has changed since discovery</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation>Could not delete file record %1 from local DB</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation>File %1 cannot be downloaded because it is non virtual!</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation>Could not get file %1 from local DB</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation>File %1 cannot be downloaded because encryption information is missing.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation>Error updating metadata: %1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation>The file %1 is currently in use</translation>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1279,6 +1357,11 @@
<translation>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation>File contains leading or trailing spaces and couldn't be renamed</translation>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>File %1 has invalid modified time. Do not upload to the server.</translation>
@@ -1483,7 +1566,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Error writing metadata to the database</translation>
</message>
@@ -1613,21 +1696,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Do you want to delete the directory <i>%1</i> and all its contents permanently?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Do you want to delete the file <i>%1</i> permanently?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Confirm deletion</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1643,30 +1711,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>No Nextcloud account configured</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Do you want to delete the directory <i>%1</i> and all its contents permanently?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Authentication error: Either username or password are wrong.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Do you want to delete the file <i>%1</i> permanently?</translation>
</message>
<message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Confirm deletion</translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
+ <message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Timeout</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>The provided credentials are not correct</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>The configured server for this client is too old</translation>
@@ -1676,16 +1744,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Please update to the latest server and restart the client.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Authentication error: Either username or password are wrong.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>No Nextcloud account configured</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>The provided credentials are not correct</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Error while canceling deletion of a file</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>Error while canceling deletion of %1</translation>
</message>
@@ -1693,19 +1776,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Server error: PROPFIND reply is not XML formatted!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>Encrypted metadata setup error!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>Encrypted metadata setup error: initial signature from server is empty.</translation>
</message>
@@ -1713,27 +1796,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Error while opening directory %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Directory not accessible on client, permission denied</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Directory not found: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>Filename encoding is not valid</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Error while reading directory %1</translation>
</message>
@@ -1973,11 +2056,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</translation>
@@ -1989,27 +2067,32 @@
<translation>Error returned from the server: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>There was an error accessing the "token" endpoint: <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Could not parse the JSON returned from the server: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>The reply from the server did not contain all expected fields</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
- <translation type="unfinished"/>
+ <translation>The reply from the server did not contain all expected fields: <br><em>%1</em></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Could not parse the JSON returned from the server: <br><em>%1</em></translation>
</message>
</context>
<context>
@@ -2053,6 +2136,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 has been removed.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 has been updated.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 has been renamed to %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 has been moved to %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation><numerusform>%1 and %n other file have been removed.</numerusform><numerusform>%1 and %n other files have been removed.</numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>Please choose a different location. The folder %1 doesn't exist.</translation>
@@ -2068,17 +2179,6 @@
<translation>Please choose a different location. %1 isn't a readable folder.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 and %n other file have been removed.</numerusform><numerusform>%1 and %n other files have been removed.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 has been removed.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 and %n other file(s) have been added.</numerusform><numerusform>%1 and %n other file(s) have been added.</numerusform></translation>
@@ -2094,33 +2194,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 and %n other file have been updated.</numerusform><numerusform>%1 and %n other files have been updated.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 has been updated.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 has been renamed to %2 and %n other file have been renamed.</numerusform><numerusform>%1 has been renamed to %2 and %n other files have been renamed.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 has been renamed to %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 has been moved to %2 and %n other file have been moved.</numerusform><numerusform>%1 has been moved to %2 and %n other files have been moved.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 has been moved to %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2157,68 +2240,68 @@
<translation>Sync Activity</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Could not read system exclude file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>A new folder larger than %1 MB has been added: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>A folder from an external storage has been added.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Please go in the settings to select it if you wish to download it.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>A folder has surpassed the set folder size limit of %1MB: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>Keep syncing</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>Stop syncing</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>The folder %1 has surpassed the set folder size limit of %2MB.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>Would you like to stop syncing this folder?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2231,12 +2314,12 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>Virtual file download failed with code "%1", status "%2" and error message "%3"</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2245,7 +2328,7 @@
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2254,22 +2337,22 @@
Alternatively, you can restore all deleted files by downloading them from the server.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>Remove all files?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>Proceed with Deletion</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>Restore Files to Server</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>Restore Files from Server</translation>
</message>
@@ -2310,11 +2393,6 @@
<translation>Could not reset folder state</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation> (backup)</translation>
@@ -2325,6 +2403,11 @@
<translation> (backup %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Undefined state.</translation>
@@ -2395,16 +2478,6 @@
<translation>Sync request was cancelled.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Sync is paused.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (Sync is paused)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>Please choose a different location. The selected folder isn't valid.</translation>
@@ -2454,6 +2527,16 @@
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.</translation>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Sync is paused.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (Sync is paused)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2497,16 +2580,6 @@
<translation>Error while loading the list of folders from the server.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Fetching folder list from server ?</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>There are unresolved conflicts. Click for details.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>Virtual file support is enabled.</translation>
@@ -2548,16 +2621,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>Download %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>File %1 of %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>There are unresolved conflicts. Click for details.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>Download %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Fetching folder list from server ?</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2604,21 +2692,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 of %2, file %3 of %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>File %1 of %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>Waiting for %n other folder(s) ?</numerusform><numerusform>Waiting for %n other folder(s) ?</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>About to start syncing</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>Waiting for %n other folder(s) ?</numerusform><numerusform>Waiting for %n other folder(s) ?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2778,11 +2861,6 @@
<translation>General Settings</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Launch on System Startup</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>Show Call Notifications</translation>
@@ -2793,11 +2871,6 @@
<translation>For System Tray</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Use &Monochrome Icons</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>Show Chat Notifications</translation>
@@ -2813,17 +2886,32 @@
<translation>Advanced</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Ask for confirmation before synchronizing new folders larger than</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Ask for confirmation before synchronising external storages</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Launch on System Startup</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Use &Monochrome Icons</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Ask for confirmation before synchronizing new folders larger than</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>Notify when synchronised folders grow larger than specified limit</translation>
@@ -2834,11 +2922,6 @@
<translation>Automatically disable synchronisation of folders that overcome limit</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Ask for confirmation before synchronising external storages</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>Move removed files to trash</translation>
@@ -2890,11 +2973,6 @@
<translation>Update channel</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Restart && Update</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>&Automatically check for updates</translation>
@@ -2915,6 +2993,16 @@
<translation>Legal Notice</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation>Restore &Default</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Restart && Update</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Server notifications that require attention.</translation>
@@ -2935,6 +3023,11 @@
<translation>You cannot disable autostart because system-wide autostart is enabled.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation>Restore to &%1</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>stable</translation>
@@ -3016,6 +3109,11 @@
<source>Debug archive is created at %1</source>
<translation>Debug archive is created at %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation>Redact information deemed sensitive before sharing! Debug archive created at %1</translation>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3180,102 +3278,97 @@
<translation>New filename</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Rename file</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
- <translation type="unfinished"/>
+ <translation>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>The following characters are not allowed: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>The following basenames are not allowed: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>The following filenames are not allowed: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>The following file extensions are not allowed: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Checking rename permissions ?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>You don't have the permission to rename this file. Please ask the author of the file to rename it.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>Failed to fetch permissions with error %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>Filename contains leading and trailing spaces.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>Filename contains leading spaces.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>Filename contains trailing spaces.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>Use invalid name</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>Filename contains illegal characters: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>Could not rename file. Please make sure you are connected to the server.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>Could not rename local file. %1</translation>
</message>
@@ -3399,16 +3492,6 @@
<translation><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Skip this time</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Get update</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>Update Failed</translation>
@@ -3433,6 +3516,16 @@
<source>Update manually</source>
<translation>Update manually</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Skip this time</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Get update</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3457,6 +3550,23 @@
<translation>Proxy server requires authentication</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Download Bandwidth</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Limit to</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>Note: proxy settings have no effects for accounts on localhost</translation>
@@ -3479,46 +3589,29 @@
<translation>Use global settings</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Download Bandwidth</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>No limit</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Limit to</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Limit to 3/4 of estimated bandwidth</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Upload Bandwidth</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Limit automatically</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Upload Bandwidth</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Hostname of proxy server</translation>
@@ -3547,6 +3640,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>Could not check for new updates.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Checking update server ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>New %1 update ready</translation>
@@ -3577,11 +3680,6 @@
<translation>Could not download update. Please open %1 to download the update manually.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>Could not check for new updates.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</translation>
@@ -3592,16 +3690,21 @@
<translation>New %1 is available. Please open %2 to download the update.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Checking update server ?</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Update status is unknown: Did not check for new updates.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation>You are using the %1 update channel. Your installation is the latest version.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation>No updates available. Your installation is the latest version.</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>No updates available. Your installation is at the latest version.</translation>
@@ -3777,11 +3880,6 @@
<translation><font colour="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>Invalid URL</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Failed to connect to %1 at %2:<br/>%3</translation>
@@ -3792,6 +3890,16 @@
<translation>Timeout while trying to connect to %1 at %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>Invalid URL</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Trying to connect to %1 at %2 ?</translation>
@@ -3802,11 +3910,6 @@
<translation>The authenticated request to the server was redirected to "%1". The URL is bad, the server is misconfigured.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>There was an invalid response to an authenticated WebDAV request</translation>
@@ -4018,64 +4121,36 @@
<translation>File names ending with a period are not supported on this file system.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Folder</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>File</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
- <translation type="unfinished"/>
+ <translation>Folder names containing the character "%1" are not supported on this file system.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>%1 name containing the character "%2" is not supported on this file system.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
- <translation type="unfinished"/>
+ <translation>File names containing the character "%1" are not supported on this file system.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>%1 name contains at least one invalid character</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>%1 name is a reserved name on this file system.</translation>
+ <translation>Folder name contains at least one invalid character</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>File name contains at least one invalid character</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
+ <translation>Folder name is a reserved name on this file system.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
+ <translation>File name is a reserved name on this file system.</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="433"/>
@@ -4083,6 +4158,24 @@
<translation>Filename contains trailing spaces.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Folder</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>File</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>%1 name containing the character "%2" is not supported on this file system.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4091,6 +4184,16 @@
<translation>Cannot be renamed or uploaded.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>%1 name contains at least one invalid character</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>%1 name is a reserved name on this file system.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>Filename contains leading spaces.</translation>
@@ -4181,64 +4284,74 @@
<translation>Server reported no %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Cannot sync due to invalid modification time</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation>Upload of %1 exceeds %2 of space left in personal files.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation>Upload of %1 exceeds %2 of space left in folder %3.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>Could not upload file, because it is open in "%1".</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>Error while deleting file record %1 from the database</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>Moved to invalid target, restoring</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>Cannot modify encrypted item because the selected certificate is not valid.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignored because of the "choose what to sync" blacklist</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Not allowed because you don't have permission to add subfolders to that folder</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Not allowed because you don't have permission to add files in that folder</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Not allowed to upload this file because it is read-only on the server, restoring</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>Not allowed to remove, restoring</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Error while reading the database</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>Server replied with an error while reading directory "%1" : %2</translation>
</message>
@@ -4246,38 +4359,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>Could not delete file %1 from local DB</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>Error updating metadata due to invalid modification time</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>The folder %1 cannot be made read-only: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>unknown exception</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Error updating metadata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>File is currently in use</translation>
</message>
@@ -4295,12 +4408,6 @@
<translation>File %1 cannot be downloaded because encryption information is missing.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>File has changed since discovery</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4357,6 +4464,12 @@
<source>The file %1 is currently in use</source>
<translation>The file %1 is currently in use</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>File has changed since discovery</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4374,39 +4487,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>could not delete file %1, error: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>Folder %1 cannot be created because of a local file or folder name clash!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>Could not create folder %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>The folder %1 cannot be made read-only: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>unknown exception</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Error updating metadata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>The file %1 is currently in use</translation>
</message>
@@ -4419,14 +4532,14 @@
<translation>Could not remove %1 because of a local file name clash</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation>Temporary error when removing local item removed from server.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Could not delete file record %1 from local DB</translation>
</message>
@@ -4434,49 +4547,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>Folder %1 cannot be renamed because of a local file or folder name clash!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>File %1 downloaded but it resulted in a local file name clash!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>Could not get file %1 from local DB</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Error setting pin state</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Error updating metadata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>The file %1 is currently in use</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>Failed to propagate directory rename in hierarchy</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Failed to rename file</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Could not delete file record %1 from local DB</translation>
</message>
@@ -4533,39 +4646,39 @@
<translation>Could not rename %1 to %2, error: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Error updating metadata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>The file %1 is currently in use</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>Could not get file %1 from local DB</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Could not delete file record %1 from local DB</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Error setting pin state</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Error writing metadata to the database</translation>
</message>
@@ -4573,22 +4686,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>Failed to upload encrypted file.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>Upload of %1 exceeds the quota for the folder</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4596,11 +4698,6 @@
<translation>File %1 has invalid modification time. Do not upload to the server.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>File Removed (start upload) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Local file changed during syncing. It will be resumed.</translation>
@@ -4630,6 +4727,22 @@
<source>The file %1 is currently in use</source>
<translation>The file %1 is currently in use</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>Upload of %1 exceeds the quota for the folder</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>Failed to upload encrypted file.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>File Removed (start upload) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4878,6 +4991,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Context menu share</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>I shared something with you</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Share options</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Send private link by email ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Copy private link to clipboard</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>Failed to encrypt folder at "%1"</translation>
@@ -4912,43 +5051,17 @@
<translation>The following folder was encrypted successfully: "%1"</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Context menu share</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Select new location ?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>I shared something with you</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Share options</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Activity</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Copy private link to clipboard</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Send private link by email ?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>Leave this share</translation>
@@ -4964,11 +5077,6 @@
<translation>Resharing this folder is not allowed</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Copy internal link</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>Encrypt</translation>
@@ -4995,12 +5103,6 @@
<translation><numerusform>Expires in %1 minutes</numerusform><numerusform>Expires in %1 minutes</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Open in browser</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Resolve conflict ?</translation>
@@ -5030,6 +5132,17 @@
<source>Delete</source>
<translation>Delete</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Copy internal link</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Open in browser</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5131,13 +5244,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>This connection is NOT secure as it is not encrypted.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Server version: %1</translation>
@@ -5157,6 +5263,13 @@
<source>The connection is not secure</source>
<translation>The connection is not secure</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>This connection is NOT secure as it is not encrypted.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5249,6 +5362,32 @@
<translation>%1 (skipped due to earlier error, trying again in %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Only %1 are available, need at least %2 to start</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Disk space is low: Downloads that would reduce free space below %1 were skipped.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>There is insufficient space available on the server for some uploads.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Unresolved conflict.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>Could not update file: %1</translation>
@@ -5269,22 +5408,6 @@
<translation>Could not set file record to local DB: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Unresolved conflict.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Only %1 are available, need at least %2 to start</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Using virtual files with suffix, but suffix is not set</translation>
@@ -5304,16 +5427,6 @@
<source>Cannot open the sync journal</source>
<translation>Cannot open the sync journal</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Disk space is low: Downloads that would reduce free space below %1 were skipped.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>There is insufficient space available on the server for some uploads.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5324,7 +5437,7 @@
<translation>Offline</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>You need to accept the terms of service</translation>
</message>
@@ -5708,11 +5821,6 @@
<source>Less than a minute</source>
<translation>Less than a minute</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5720,20 +5828,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1 minutes</numerusform><numerusform>%1 minutes</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1 hours</numerusform><numerusform>%1 hours</numerusform></translation>
@@ -5748,6 +5846,21 @@
<source>%1 days</source>
<translation><numerusform>%1 days</numerusform><numerusform>%1 days</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation><numerusform>%n minute(s)</numerusform><numerusform>%n minute(s)</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n hour(s)</numerusform><numerusform>%n hour(s)</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n day(s)</numerusform><numerusform>%n day(s)</numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5890,6 +6003,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Please sign in</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>There are no sync folders configured.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Disconnected from %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Unsupported Server Version</translation>
@@ -5910,31 +6038,6 @@
<translation>Your account %1 requires you to accept the terms of service of your server. You will be redirected to %2 to acknowledge that you have read it and agrees with it.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Disconnected from %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Disconnected from accounts:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Account %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Please sign in</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Account synchronisation is disabled</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5956,11 +6059,6 @@
<translation>macOS VFS for %1: A problem was encountered.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>There are no sync folders configured.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Checking for changes in remote "%1"</translation>
@@ -5971,6 +6069,21 @@
<translation>Checking for changes in local "%1"</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Disconnected from accounts:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Account %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Account synchronisation is disabled</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5979,11 +6092,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Local Folder</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Username</translation>
@@ -6019,22 +6127,11 @@
<translation>Ask before syncing folders larger than</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Ask before syncing external storages</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Choose what to sync</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Keep local data</translation>
@@ -6049,6 +6146,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Erase local folder and start a clean sync</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Choose what to sync</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Local Folder</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6089,6 +6202,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>in the future</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1m</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>now</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Some time ago</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6129,55 +6287,10 @@
<source>Synced %1</source>
<translation>Synced %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>in the future</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>now</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1m</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Some time ago</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
+ <translation>Error deleting the file</translation>
</message>
<message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
@@ -6425,6 +6538,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>Open local or group folders</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Open local folder</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Connected</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>Disconnected</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>Open local folder "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>Open group folder "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>Open %1 in file explorer</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>User group and local folders menu</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6614,16 +6770,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6638,6 +6784,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6871,16 +7027,16 @@
<translation>Error occurred during setup</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Preparing to sync</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>Stopping sync</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Preparing to sync</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Sync is paused</translation>
@@ -6939,4 +7095,17 @@
<translation>Free up local space</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>Enable fast sync</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_en.ts nextcloud-desktop-3.16.6/translations/client_en.ts
--- nextcloud-desktop-3.16.4/translations/client_en.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_en.ts 2025-06-18 22:57:35.000000000 +0200
@@ -2,133 +2,437 @@
<!DOCTYPE TS>
<TS version="2.1" language="en_US">
<context>
+ <name>ActivityItem</name>
+ <message>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="24"/>
+ <source>Open %1 locally</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/ActivityItem.qml" line="29"/>
+ <source>In %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>ActivityItemContent</name>
+ <message>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="172"/>
+ <source>Open file details</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/ActivityItemContent.qml" line="194"/>
+ <source>Dismiss</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>ActivityList</name>
+ <message>
+ <location filename="../src/gui/tray/ActivityList.qml" line="43"/>
+ <source>Activity list</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/ActivityList.qml" line="127"/>
+ <source>Scroll to top</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/ActivityList.qml" line="156"/>
+ <source>No activities yet</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CallNotificationDialog</name>
+ <message>
+ <location filename="../src/gui/tray/CallNotificationDialog.qml" line="176"/>
+ <source>Talk notification caller avatar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/CallNotificationDialog.qml" line="235"/>
+ <source>Answer Talk call notification</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/CallNotificationDialog.qml" line="242"/>
+ <source>Decline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/CallNotificationDialog.qml" line="252"/>
+ <source>Decline Talk call notification</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>CloudProviderWrapper</name>
<message>
- <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="107"/>
+ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="106"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="124"/>
- <source>Checking for changes in '%1'</source>
+ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="123"/>
+ <source>Checking for changes in "%1"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="129"/>
+ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="128"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="134"/>
+ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="133"/>
<source>Syncing %1 of %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="141"/>
+ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="140"/>
<source>Syncing %1 (%2 left)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="144"/>
+ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="143"/>
<source>Syncing %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="165"/>
- <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="227"/>
+ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="164"/>
+ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="226"/>
<source>No recently changed files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="181"/>
+ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="180"/>
<source>Sync paused</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="184"/>
+ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="183"/>
<source>Syncing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="220"/>
+ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="219"/>
<source>Open website</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="232"/>
+ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="231"/>
<source>Recently changed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="239"/>
+ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="238"/>
<source>Pause synchronization</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="246"/>
+ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="245"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="249"/>
+ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="248"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="252"/>
+ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="251"/>
<source>Log out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="255"/>
+ <location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="254"/>
<source>Quit sync client</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>FileSystem</name>
+ <name>ConflictDelegate</name>
+ <message>
+ <location filename="../src/gui/ConflictDelegate.qml" line="62"/>
+ <source>Local version</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/ConflictDelegate.qml" line="77"/>
+ <source>Server version</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>CurrentAccountHeaderButton</name>
+ <message>
+ <location filename="../src/gui/tray/CurrentAccountHeaderButton.qml" line="36"/>
+ <source>Current account</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/CurrentAccountHeaderButton.qml" line="49"/>
+ <location filename="../src/gui/tray/CurrentAccountHeaderButton.qml" line="121"/>
+ <source>Resume sync for all</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/CurrentAccountHeaderButton.qml" line="49"/>
+ <location filename="../src/gui/tray/CurrentAccountHeaderButton.qml" line="121"/>
+ <source>Pause sync for all</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/CurrentAccountHeaderButton.qml" line="102"/>
+ <source>Add account</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/CurrentAccountHeaderButton.qml" line="106"/>
+ <source>Add new account</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/CurrentAccountHeaderButton.qml" line="127"/>
+ <source>Settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/CurrentAccountHeaderButton.qml" line="138"/>
+ <source>Exit</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
- <location filename="../src/common/filesystembase.cpp" line="445"/>
- <source>Could not make directories in trash</source>
+ <location filename="../src/gui/tray/CurrentAccountHeaderButton.qml" line="166"/>
+ <source>Current account avatar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/common/filesystembase.cpp" line="459"/>
- <location filename="../src/common/filesystembase.cpp" line="465"/>
- <source>Could not move '%1' to '%2'</source>
+ <location filename="../src/gui/tray/CurrentAccountHeaderButton.qml" line="196"/>
+ <source>Current account status is online</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/common/filesystembase.cpp" line="502"/>
- <source>Moving to the trash is not implemented on this platform</source>
+ <location filename="../src/gui/tray/CurrentAccountHeaderButton.qml" line="196"/>
+ <source>Current account status is do not disturb</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/CurrentAccountHeaderButton.qml" line="271"/>
+ <source>Account switcher and settings menu</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>Flow2AuthWidget</name>
+ <name>EditFileLocallyLoadingDialog</name>
<message>
- <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/>
- <source>Browser Authentication</source>
+ <location filename="../src/gui/tray/EditFileLocallyLoadingDialog.qml" line="78"/>
+ <source>Opening file for local editing</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>EmojiPicker</name>
<message>
- <location filename="../src/gui/wizard/flow2authwidget.ui" line="32"/>
- <source>Please switch to your browser to proceed.</source>
+ <location filename="../src/gui/EmojiPicker.qml" line="136"/>
+ <source>No recent emojis</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>EncryptionTokenDiscoveryDialog</name>
<message>
- <location filename="../src/gui/wizard/flow2authwidget.ui" line="42"/>
- <source>An error occurred while connecting. Please try again.</source>
+ <location filename="../src/gui/tray/EncryptionTokenDiscoveryDialog.qml" line="83"/>
+ <source>Discovering the certificates stored on your USB token</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>EncryptionTokenSelectionWindow</name>
+ <message>
+ <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="41"/>
+ <source>Token Encryption Key Chooser</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="78"/>
+ <source>Available Keys for end-to-end Encryption:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="121"/>
+ <source>Choose</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/EncryptionTokenSelectionWindow.qml" line="125"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>ErrorBox</name>
+ <message>
+ <location filename="../src/gui/ErrorBox.qml" line="63"/>
+ <source>Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>FileDetailsPage</name>
+ <message>
+ <location filename="../src/gui/filedetails/FileDetailsPage.qml" line="226"/>
+ <source>Activity</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/FileDetailsPage.qml" line="235"/>
+ <source>Sharing</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>FileDetailsWindow</name>
+ <message>
+ <location filename="../src/gui/filedetails/FileDetailsWindow.qml" line="37"/>
+ <source>File details of %1 ? %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>FileProviderEvictionDialog</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderEvictionDialog.qml" line="36"/>
+ <source>Evict materialised files</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderEvictionDialog.qml" line="52"/>
+ <source>Materialised items</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderEvictionDialog.qml" line="60"/>
+ <source>Reload</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>FileProviderFileDelegate</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
+ <source>Delete</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>FileProviderSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="32"/>
+ <source>Virtual files settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="53"/>
+ <source>General settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="61"/>
+ <source>Enable virtual files</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>FileProviderStorageInfo</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderStorageInfo.qml" line="40"/>
+ <source>Local storage use</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderStorageInfo.qml" line="49"/>
+ <source>%1 GB of %2 GB remote files synced</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderStorageInfo.qml" line="59"/>
+ <source>Evict local copies ?</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>FileProviderSyncStatus</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSyncStatus.qml" line="58"/>
+ <source>Syncing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSyncStatus.qml" line="58"/>
+ <source>All synced!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSyncStatus.qml" line="71"/>
+ <source>Request sync</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSyncStatus.qml" line="78"/>
+ <source>Request a sync of changes for the VFS environment.
+macOS may ignore or delay this request.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>FileSystem</name>
<message>
- <location filename="../src/gui/wizard/flow2authwidget.ui" line="52"/>
- <source>Re-open Browser</source>
+ <location filename="../src/libsync/filesystem.cpp" line="290"/>
+ <source>Error removing "%1": %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/flow2authwidget.ui" line="65"/>
- <source>Copy link</source>
+ <location filename="../src/libsync/filesystem.cpp" line="333"/>
+ <source>Could not remove folder "%1"</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>Flow2AuthWidget</name>
+ <message>
+ <location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/>
+ <source>Browser Authentication</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/flow2authwidget.ui" line="47"/>
+ <source>Logo</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/flow2authwidget.ui" line="76"/>
+ <source>Switch to your browser to connect your account</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/flow2authwidget.ui" line="229"/>
+ <source>An error occurred while connecting. Please try again.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -148,343 +452,616 @@
<context>
<name>FolderWizardTargetPage</name>
<message>
- <location filename="../src/gui/folderwizardtargetpage.ui" line="131"/>
+ <location filename="../src/gui/folderwizardtargetpage.ui" line="67"/>
<source>Select a remote destination folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizardtargetpage.ui" line="143"/>
- <source>Create Folder</source>
+ <location filename="../src/gui/folderwizardtargetpage.ui" line="79"/>
+ <source>Create folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/>
+ <location filename="../src/gui/folderwizardtargetpage.ui" line="99"/>
<source>Refresh</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/>
+ <location filename="../src/gui/folderwizardtargetpage.ui" line="113"/>
<source>Folders</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>MainWindow</name>
+ <message>
+ <location filename="../src/gui/tray/MainWindow.qml" line="245"/>
+ <source>Nextcloud desktop main dialog</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/MainWindow.qml" line="382"/>
+ <source>Unified search results list</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/MainWindow.qml" line="446"/>
+ <source>New activities</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>OCC::AbstractNetworkJob</name>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="282"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="315"/>
<source>Connection timed out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="284"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="317"/>
<source>Unknown error: network reply was deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/abstractnetworkjob.cpp" line="436"/>
+ <location filename="../src/libsync/abstractnetworkjob.cpp" line="478"/>
<source>Server replied "%1 %2" to "%3 %4"</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>OCC::Account</name>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="1018"/>
+ <source>File %1 is already locked by %2.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="1020"/>
+ <source>Lock operation on %1 failed with error %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/account.cpp" line="1022"/>
+ <source>Unlock operation on %1 failed with error %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>OCC::AccountManager</name>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="353"/>
- <source>End to end encryption mnemonic</source>
+ <location filename="../src/gui/accountmanager.cpp" line="232"/>
+ <source>%1 accounts were detected from a legacy desktop client.
+Should the accounts be imported?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="354"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountmanager.cpp" line="234"/>
+ <source>1 account was detected from a legacy desktop client.
+Should the account be imported?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountmanager.cpp" line="236"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
+ <source>Legacy import</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountmanager.cpp" line="237"/>
+ <source>Import</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountmanager.cpp" line="238"/>
+ <source>Skip</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
+ <source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="77"/>
+ <location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="84"/>
+ <location filename="../src/gui/accountsettings.ui" line="244"/>
<source>Synchronize none</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="91"/>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply manual changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="139"/>
+ <location filename="../src/gui/accountsettings.ui" line="270"/>
+ <source>Standard file sync</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="314"/>
+ <source>Virtual file sync</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="319"/>
+ <source>Connection settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
<source>Apply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="204"/>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
<source>Storage space: ?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="126"/>
- <location filename="../src/gui/accountsettings.cpp" line="759"/>
- <location filename="../src/gui/accountsettings.cpp" line="1154"/>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="174"/>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
<source>Connected with <server> as <user></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="187"/>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
<source>No account configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="216"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
<source>This account supports end-to-end encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="218"/>
- <source>Enable encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="100"/>
+ <source>End-to-end Encryption with Virtual Files</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="101"/>
+ <source>You seem to have the Virtual Files feature enabled on this folder. At the moment, it is not possible to implicitly download virtual files that are end-to-end encrypted. To get the best experience with virtual files and end-to-end encryption, make sure the encrypted folder is marked with "Make always available locally".</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="109"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
+ <source>Do not encrypt folder</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="112"/>
+ <location filename="../src/gui/accountsettings.cpp" line="134"/>
+ <source>Encrypt folder</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="122"/>
+ <source>End-to-end Encryption</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="125"/>
+ <source>This will encrypt your folder and all files within it. These files will no longer be accessible without your encryption mnemonic key.
+<b>This process is not reversible. Are you sure you want to proceed?</b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="306"/>
+ <source>Disable encryption</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="316"/>
+ <source>Display mnemonic</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="323"/>
+ <source>End-to-end encryption has been enabled for this account</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <source>Warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="402"/>
+ <source>Please wait for the folder to sync before trying to encrypt it.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="404"/>
+ <source>The folder has a minor sync problem. Encryption of this folder will be possible once it has synced successfully</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="406"/>
+ <source>The folder has a sync error. Encryption of this folder will be possible once it has synced successfully</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="561"/>
+ <location filename="../src/gui/accountsettings.cpp" line="417"/>
+ <source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
+Would you like to set up end-to-end encryption?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="442"/>
+ <source>You cannot encrypt a folder with contents, please remove the files.
+Wait for the new sync, then encrypt it.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="466"/>
+ <source>Encryption failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="466"/>
+ <source>Could not encrypt folder because the folder does not exist anymore</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="569"/>
- <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <location filename="../src/gui/accountsettings.cpp" line="615"/>
+ <location filename="../src/gui/accountsettings.cpp" line="685"/>
<source>Edit Ignored Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="609"/>
+ <location filename="../src/gui/accountsettings.cpp" line="618"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
+ <source>Create new folder</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="624"/>
+ <location filename="../src/gui/accountsettings.cpp" line="714"/>
+ <source>Availability</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="693"/>
<source>Choose what to sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="615"/>
+ <location filename="../src/gui/accountsettings.cpp" line="699"/>
<source>Force sync now</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="617"/>
+ <location filename="../src/gui/accountsettings.cpp" line="701"/>
<source>Restart sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="626"/>
+ <location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="697"/>
+ <location filename="../src/gui/accountsettings.cpp" line="723"/>
+ <source>Disable virtual file support ?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
+ <source>Enable virtual file support %1 ?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="826"/>
<source>Folder creation failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="751"/>
+ <location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="758"/>
+ <location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="843"/>
- <source>Sync Running</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1005"/>
+ <source>Disable virtual file support?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="844"/>
- <source>The syncing operation is running.<br/>Do you want to terminate it?</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1006"/>
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
+
+The only advantage of disabling virtual file support is that the selective sync feature will become available again.
+
+This action will abort any currently running synchronization.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="933"/>
- <source>%1 in use</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1013"/>
+ <source>Disable support</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="960"/>
- <source>%1 as <i>%2</i></source>
+ <location filename="../src/gui/accountsettings.cpp" line="1100"/>
+ <source>End-to-end encryption mnemonic</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="966"/>
- <source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="968"/>
- <source>Connected to %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="970"/>
- <source>Server %1 is temporarily unavailable.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="972"/>
- <source>Server %1 is currently in maintenance mode.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="974"/>
- <source>Signed out from %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1201"/>
+ <source>Sync Running</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="983"/>
- <source>Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1202"/>
+ <source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="990"/>
- <source>No connection to %1 at %2.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1109"/>
- <source>There are folders that were not synchronized because they are too big: </source>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1111"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
+ <location filename="../src/gui/accountsettings.cpp" line="1323"/>
+ <source>Connected to %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1112"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <location filename="../src/gui/accountsettings.cpp" line="1327"/>
+ <source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1146"/>
- <source>Confirm Account Removal</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1330"/>
+ <source>Server %1 is currently in maintenance mode.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1147"/>
- <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <location filename="../src/gui/accountsettings.cpp" line="1336"/>
+ <source>Signed out from %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1153"/>
- <source>Remove connection</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="545"/>
- <location filename="../src/gui/accountsettings.cpp" line="602"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
<source>Open folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="623"/>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
<source>Resume sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="623"/>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
<source>Pause sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="698"/>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
<source><p>Could not create local folder <i>%1</i>.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="752"/>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="920"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="921"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
<source>%1 of %2 in use</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="930"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="987"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
<source>Connecting to %1 ?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="996"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>OCC::AccountSetupFromCommandLineJob</name>
+ <message>
+ <location filename="../src/gui/accountsetupfromcommandlinejob.cpp" line="142"/>
+ <source>The authenticated request to the server was redirected to "%1". The URL is bad, the server is misconfigured.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsetupfromcommandlinejob.cpp" line="152"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsetupfromcommandlinejob.cpp" line="160"/>
+ <source>There was an invalid response to an authenticated WebDAV request</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="134"/>
+ <location filename="../src/gui/accountstate.cpp" line="158"/>
<source>Signed out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="136"/>
+ <location filename="../src/gui/accountstate.cpp" line="160"/>
<source>Disconnected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="138"/>
+ <location filename="../src/gui/accountstate.cpp" line="162"/>
<source>Connected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="140"/>
+ <location filename="../src/gui/accountstate.cpp" line="164"/>
<source>Service unavailable</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="142"/>
+ <location filename="../src/gui/accountstate.cpp" line="166"/>
<source>Maintenance mode</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="144"/>
+ <location filename="../src/gui/accountstate.cpp" line="168"/>
+ <source>Redirect detected</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="170"/>
<source>Network error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="146"/>
+ <location filename="../src/gui/accountstate.cpp" line="172"/>
<source>Configuration error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="148"/>
+ <location filename="../src/gui/accountstate.cpp" line="174"/>
<source>Asking Credentials</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="150"/>
+ <location filename="../src/gui/accountstate.cpp" line="176"/>
+ <source>Need the user to accept the terms of service</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="178"/>
<source>Unknown account state</source>
<translation type="unfinished"></translation>
</message>
@@ -492,13 +1069,18 @@
<context>
<name>OCC::ActivityListModel</name>
<message>
- <location filename="../src/gui/tray/ActivityListModel.cpp" line="322"/>
- <source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="483"/>
+ <source>For more activities please open the Activity app.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/tray/ActivityListModel.cpp" line="424"/>
- <source>For more activities please open the Activity app.</source>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="503"/>
+ <source>Fetching activities ?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/activitylistmodel.cpp" line="593"/>
+ <source>Network error occurred: client will retry syncing.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -516,17 +1098,22 @@
</message>
<message>
<location filename="../src/gui/addcertificatedialog.ui" line="35"/>
- <source>Certificate & Key (pkcs12) :</source>
+ <source>Certificate & Key (pkcs12):</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
+ <location filename="../src/gui/addcertificatedialog.ui" line="60"/>
+ <source>Certificate password:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="60"/>
- <source>Certificate password :</source>
+ <location filename="../src/gui/addcertificatedialog.ui" line="79"/>
+ <source>An encrypted pkcs12 bundle is strongly recommended as a copy will be stored in the configuration file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -543,18 +1130,84 @@
<context>
<name>OCC::Application</name>
<message>
- <location filename="../src/gui/application.cpp" line="202"/>
- <source>Error accessing the configuration file</source>
+ <location filename="../src/gui/application.cpp" line="185"/>
+ <source>Some settings were configured in %1 versions of this client and use features that are not available in this version.<br><br>Continuing will mean <b>%2 these settings</b>.<br><br>The current configuration file was already backed up to <i>%3</i>.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/application.cpp" line="191"/>
+ <source>newer</source>
+ <comment>newer software version</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/application.cpp" line="191"/>
+ <source>older</source>
+ <comment>older software version</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/application.cpp" line="192"/>
+ <source>ignoring</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/application.cpp" line="192"/>
+ <source>deleting</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/application.cpp" line="194"/>
+ <source>Quit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/application.cpp" line="195"/>
+ <source>Continue</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/application.cpp" line="514"/>
+ <source>%1 accounts</source>
+ <comment>number of accounts imported</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/application.cpp" line="515"/>
+ <source>1 account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="203"/>
- <source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user.</source>
+ <location filename="../src/gui/application.cpp" line="517"/>
+ <source>%1 folders</source>
+ <comment>number of folders imported</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="206"/>
- <source>Quit %1</source>
+ <location filename="../src/gui/application.cpp" line="518"/>
+ <source>1 folder</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/application.cpp" line="520"/>
+ <source>Legacy import</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/application.cpp" line="521"/>
+ <source>Imported %1 and %2 from a legacy desktop client.
+%3</source>
+ <comment>number of accounts and folders imported. list of users.</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/application.cpp" line="610"/>
+ <source>Error accessing the configuration file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/application.cpp" line="611"/>
+ <source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -567,12 +1220,12 @@
</message>
<message>
<location filename="../src/gui/authenticationdialog.cpp" line="32"/>
- <source>Enter username and password for '%1' at %2.</source>
+ <source>Enter username and password for "%1" at %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/authenticationdialog.cpp" line="37"/>
- <source>&User:</source>
+ <source>&Username:</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -582,9 +1235,231 @@
</message>
</context>
<context>
+ <name>OCC::BasePropagateRemoteDeleteEncrypted</name>
+ <message>
+ <location filename="../src/libsync/basepropagateremotedeleteencrypted.cpp" line="94"/>
+ <source>"%1 Failed to unlock encrypted folder %2".</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/basepropagateremotedeleteencrypted.cpp" line="136"/>
+ <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>OCC::BulkPropagatorJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
+ <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="361"/>
+ <source>File Removed (start upload) %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="380"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="393"/>
+ <source>Local file changed during syncing. It will be resumed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="407"/>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="754"/>
+ <source>Local file changed during sync.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="517"/>
+ <source>Network error: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="563"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="566"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="736"/>
+ <source>The local file was removed during sync.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="784"/>
+ <source>Restoration failed: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>OCC::CaseClashConflictSolver</name>
+ <message>
+ <location filename="../src/libsync/caseclashconflictsolver.cpp" line="78"/>
+ <source>Cannot rename file because a file with the same name already exists on the server. Please pick another name.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/caseclashconflictsolver.cpp" line="121"/>
+ <source>Could not rename file. Please make sure you are connected to the server.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/caseclashconflictsolver.cpp" line="172"/>
+ <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/caseclashconflictsolver.cpp" line="179"/>
+ <source>Failed to fetch permissions with error %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/caseclashconflictsolver.cpp" line="200"/>
+ <source>Filename contains leading and trailing spaces.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/caseclashconflictsolver.cpp" line="203"/>
+ <source>Filename contains leading spaces.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/caseclashconflictsolver.cpp" line="206"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>OCC::CaseClashFilenameDialog</name>
+ <message>
+ <location filename="../src/gui/caseclashfilenamedialog.ui" line="14"/>
+ <source>Case Clash Conflict</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
+ <source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
+ <source>Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/caseclashfilenamedialog.ui" line="53"/>
+ <source>Existing file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/caseclashfilenamedialog.ui" line="60"/>
+ <source>file A</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/caseclashfilenamedialog.ui" line="107"/>
+ <location filename="../src/gui/caseclashfilenamedialog.ui" line="213"/>
+ <source>today</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/caseclashfilenamedialog.ui" line="114"/>
+ <location filename="../src/gui/caseclashfilenamedialog.ui" line="220"/>
+ <source>0 byte</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/caseclashfilenamedialog.ui" line="121"/>
+ <location filename="../src/gui/caseclashfilenamedialog.cpp" line="109"/>
+ <source>Open existing file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/caseclashfilenamedialog.ui" line="165"/>
+ <source>Case clashing file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/caseclashfilenamedialog.ui" line="172"/>
+ <source>file B</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/caseclashfilenamedialog.ui" line="227"/>
+ <location filename="../src/gui/caseclashfilenamedialog.cpp" line="117"/>
+ <source>Open clashing file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/caseclashfilenamedialog.ui" line="268"/>
+ <source>Please enter a new name for the clashing file:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/caseclashfilenamedialog.ui" line="281"/>
+ <source>New filename</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/caseclashfilenamedialog.cpp" line="101"/>
+ <source>Rename file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/caseclashfilenamedialog.cpp" line="103"/>
+ <source>The file "%1" could not be synced because of a case clash conflict with an existing file on this system.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/caseclashfilenamedialog.cpp" line="104"/>
+ <source>%1 does not support equal file names with only letter casing differences.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/caseclashfilenamedialog.cpp" line="249"/>
+ <source>Filename contains leading and trailing spaces.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/caseclashfilenamedialog.cpp" line="252"/>
+ <source>Filename contains leading spaces.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/caseclashfilenamedialog.cpp" line="254"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/caseclashfilenamedialog.cpp" line="259"/>
+ <source>Use invalid name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/caseclashfilenamedialog.cpp" line="284"/>
+ <source>Filename contains illegal characters: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1041"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"></translation>
</message>
@@ -592,197 +1467,642 @@
<context>
<name>OCC::ClientSideEncryption</name>
<message>
- <location filename="../src/libsync/clientsideencryption.cpp" line="1000"/>
- <source>Please enter your end to end encryption passphrase:<br><br>User: %2<br>Account: %3<br></source>
+ <location filename="../src/libsync/clientsideencryption.cpp" line="1147"/>
+ <source>Input PIN code</source>
+ <comment>Please keep it short and shorter than "Enter Certificate USB Token PIN:"</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/clientsideencryption.cpp" line="1008"/>
+ <location filename="../src/libsync/clientsideencryption.cpp" line="1148"/>
+ <source>Enter Certificate USB Token PIN:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/clientsideencryption.cpp" line="1165"/>
+ <source>Invalid PIN. Login failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
+ <source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/clientsideencryption.cpp" line="2223"/>
+ <source>Please enter your end-to-end encryption passphrase:<br><br>Username: %2<br>Account: %3<br></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/clientsideencryption.cpp" line="2231"/>
<source>Enter E2E passphrase</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>OCC::ConflictDialog</name>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="14"/>
+ <source>Sync Conflict</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="20"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="96"/>
+ <source>Conflicting versions of %1.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="32"/>
+ <source>Which version of the file do you want to keep?<br/>If you select both versions, the local file will have a number added to its name.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="46"/>
+ <source>Local version</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="57"/>
+ <location filename="../src/gui/conflictdialog.ui" line="165"/>
+ <source>Click to open the file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="96"/>
+ <location filename="../src/gui/conflictdialog.ui" line="204"/>
+ <source>today</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="103"/>
+ <location filename="../src/gui/conflictdialog.ui" line="211"/>
+ <source>0 byte</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="110"/>
+ <source><a href="%1">Open local version</a></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="154"/>
+ <source>Server version</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.ui" line="218"/>
+ <source><a href="%1">Open server version</a></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="54"/>
+ <location filename="../src/gui/conflictdialog.cpp" line="179"/>
+ <source>Keep selected version</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="150"/>
+ <source>Open local version</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="158"/>
+ <source>Open server version</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="176"/>
+ <source>Keep both versions</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="177"/>
+ <source>Keep local version</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictdialog.cpp" line="178"/>
+ <source>Keep server version</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConflictSolver</name>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="135"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="135"/>
+ <location filename="../src/gui/conflictsolver.cpp" line="159"/>
+ <source>Moving file failed:
+
+%1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="289"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="183"/>
+ <source>Timeout</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="290"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="299"/>
<source>Please update to the latest server and restart the client.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="147"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="50"/>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
<source>No Nextcloud account configured</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="159"/>
- <source>timeout</source>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="196"/>
- <source>The provided credentials are not correct</source>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
+ <source>Error while canceling deletion of a file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <source>Error while canceling deletion of %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>OCC::DiscoveryMainThread</name>
+ <name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="638"/>
- <source>Aborted by the user</source>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
+ <source>Server error: PROPFIND reply is not XML formatted!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
+ <source>Encrypted metadata setup error!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
+ <source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>OCC::DiscoverySingleDirectoryJob</name>
+ <name>OCC::DiscoverySingleLocalDirectoryJob</name>
+ <message>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
+ <source>Error while opening directory %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
+ <source>Directory not accessible on client, permission denied</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="399"/>
- <source>The server file discovery reply is missing data.</source>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
+ <source>Directory not found: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
+ <source>Filename encoding is not valid</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
+ <source>Error while reading directory %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>OCC::Flow2Auth</name>
+ <name>OCC::EditLocallyJob</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="109"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="212"/>
- <source>Error returned from the server: <em>%1</em></source>
+ <location filename="../src/gui/editlocallyjob.cpp" line="47"/>
+ <location filename="../src/gui/editlocallyjob.cpp" line="106"/>
+ <location filename="../src/gui/editlocallyjob.cpp" line="182"/>
+ <location filename="../src/gui/editlocallyjob.cpp" line="323"/>
+ <location filename="../src/gui/editlocallyjob.cpp" line="378"/>
+ <location filename="../src/gui/editlocallyjob.cpp" line="387"/>
+ <location filename="../src/gui/editlocallyjob.cpp" line="414"/>
+ <location filename="../src/gui/editlocallyjob.cpp" line="434"/>
+ <source>Could not start editing locally.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="112"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="215"/>
- <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source>
+ <location filename="../src/gui/editlocallyjob.cpp" line="47"/>
+ <location filename="../src/gui/editlocallyjob.cpp" line="323"/>
+ <source>An error occurred during setup.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="115"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="218"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <location filename="../src/gui/editlocallyjob.cpp" line="53"/>
+ <location filename="../src/gui/editlocallyjob.cpp" line="138"/>
+ <source>Could not find a file for local editing. Make sure its path is valid and it is synced locally.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="118"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="221"/>
- <source>The reply from the server did not contain all expected fields</source>
+ <location filename="../src/gui/editlocallyjob.cpp" line="68"/>
+ <location filename="../src/gui/editlocallyjob.cpp" line="76"/>
+ <location filename="../src/gui/editlocallyjob.cpp" line="83"/>
+ <location filename="../src/gui/editlocallyjob.cpp" line="133"/>
+ <source>Could not find a file for local editing. Make sure it is not excluded via selective sync.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/editlocallyjob.cpp" line="107"/>
+ <location filename="../src/gui/editlocallyjob.cpp" line="379"/>
+ <location filename="../src/gui/editlocallyjob.cpp" line="388"/>
+ <source>An error occurred during data retrieval.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/editlocallyjob.cpp" line="183"/>
+ <location filename="../src/gui/editlocallyjob.cpp" line="415"/>
+ <source>An error occurred trying to synchronise the file to edit locally.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/editlocallyjob.cpp" line="367"/>
+ <source>Server error: PROPFIND reply is not XML formatted!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/editlocallyjob.cpp" line="369"/>
+ <source>Could not find a remote file info for local editing. Make sure its path is valid.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/editlocallyjob.cpp" line="435"/>
+ <source>Invalid local file path.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/editlocallyjob.cpp" line="445"/>
+ <source>Could not open %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/editlocallyjob.cpp" line="445"/>
+ <source>Please try again.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/editlocallyjob.cpp" line="530"/>
+ <source>File %1 already locked.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/editlocallyjob.cpp" line="531"/>
+ <location filename="../src/gui/editlocallyjob.cpp" line="542"/>
+ <source>Lock will last for %1 minutes. You can also unlock this file manually once you are finished editing.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/editlocallyjob.cpp" line="541"/>
+ <source>File %1 now locked.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/editlocallyjob.cpp" line="550"/>
+ <source>File %1 could not be locked.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>OCC::Flow2AuthCredsPage</name>
+ <name>OCC::EditLocallyManager</name>
<message>
- <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="37"/>
- <source>Connect to %1</source>
+ <location filename="../src/gui/editlocallymanager.cpp" line="118"/>
+ <source>Could not validate the request to open a file from server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/flow2authcredspage.cpp" line="38"/>
- <source>Login in your browser (Login Flow v2)</source>
+ <location filename="../src/gui/editlocallymanager.cpp" line="119"/>
+ <source>Please try again.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>OCC::Flow2AuthWidget</name>
+ <name>OCC::EditLocallyVerificationJob</name>
<message>
- <location filename="../src/gui/wizard/flow2authwidget.cpp" line="80"/>
- <source>Unable to open the Browser, please copy the link to your Browser.</source>
+ <location filename="../src/gui/editlocallyverificationjob.cpp" line="92"/>
+ <source>Invalid token received.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/flow2authwidget.cpp" line="143"/>
- <source>Waiting for authorization</source>
+ <location filename="../src/gui/editlocallyverificationjob.cpp" line="92"/>
+ <location filename="../src/gui/editlocallyverificationjob.cpp" line="99"/>
+ <location filename="../src/gui/editlocallyverificationjob.cpp" line="105"/>
+ <source>Please try again.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/flow2authwidget.cpp" line="148"/>
- <source>Polling for authorization</source>
+ <location filename="../src/gui/editlocallyverificationjob.cpp" line="99"/>
+ <source>Invalid file path was provided.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/flow2authwidget.cpp" line="153"/>
- <source>Starting authorization</source>
+ <location filename="../src/gui/editlocallyverificationjob.cpp" line="105"/>
+ <source>Could not find an account for local editing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/flow2authwidget.cpp" line="157"/>
- <source>Link copied to clipboard.</source>
+ <location filename="../src/gui/editlocallyverificationjob.cpp" line="129"/>
+ <source>Could not start editing locally.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/editlocallyverificationjob.cpp" line="130"/>
+ <source>An error occurred trying to verify the request to edit locally.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>OCC::Folder</name>
+ <name>OCC::EncryptFolderJob</name>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
- <source>Local folder %1 does not exist.</source>
+ <location filename="../src/libsync/encryptfolderjob.cpp" line="129"/>
+ <source>Could not generate the metadata for encryption, Unlocking the folder.
+This can be an issue with your OpenSSL libraries.</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>OCC::EncryptedFolderMetadataHandler</name>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
- <source>%1 should be a folder but is not.</source>
+ <location filename="../src/libsync/encryptedfoldermetadatahandler.cpp" line="64"/>
+ <location filename="../src/libsync/encryptedfoldermetadatahandler.cpp" line="71"/>
+ <location filename="../src/libsync/encryptedfoldermetadatahandler.cpp" line="77"/>
+ <location filename="../src/libsync/encryptedfoldermetadatahandler.cpp" line="180"/>
+ <location filename="../src/libsync/encryptedfoldermetadatahandler.cpp" line="189"/>
+ <location filename="../src/libsync/encryptedfoldermetadatahandler.cpp" line="217"/>
+ <source>Error fetching metadata.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="147"/>
- <source>%1 is not readable.</source>
+ <location filename="../src/libsync/encryptedfoldermetadatahandler.cpp" line="132"/>
+ <location filename="../src/libsync/encryptedfoldermetadatahandler.cpp" line="138"/>
+ <location filename="../src/libsync/encryptedfoldermetadatahandler.cpp" line="231"/>
+ <source>Error locking folder.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="375"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
+ <location filename="../src/libsync/encryptedfoldermetadatahandler.cpp" line="165"/>
+ <source>Error fetching encrypted folder ID.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/encryptedfoldermetadatahandler.cpp" line="199"/>
+ <source>Error parsing or decrypting metadata.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/encryptedfoldermetadatahandler.cpp" line="341"/>
+ <source>Failed to upload metadata</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>OCC::FileDetails</name>
+ <message numerus="yes">
+ <location filename="../src/gui/filedetails/filedetails.cpp" line="125"/>
+ <source>%1 second(s) ago</source>
+ <comment>seconds elapsed since file last modified</comment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/filedetails/filedetails.cpp" line="128"/>
+ <source>%1 minute(s) ago</source>
+ <comment>minutes elapsed since file last modified</comment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/filedetails/filedetails.cpp" line="131"/>
+ <source>%1 hour(s) ago</source>
+ <comment>hours elapsed since file last modified</comment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/filedetails/filedetails.cpp" line="134"/>
+ <source>%1 day(s) ago</source>
+ <comment>days elapsed since file last modified</comment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/filedetails/filedetails.cpp" line="137"/>
+ <source>%1 month(s) ago</source>
+ <comment>months elapsed since file last modified</comment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/filedetails/filedetails.cpp" line="140"/>
+ <source>%1 year(s) ago</source>
+ <comment>years elapsed since file last modified</comment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/filedetails/filedetails.cpp" line="172"/>
+ <source>Locked by %1 - Expires in %2 minute(s)</source>
+ <comment>remaining time before lock expires</comment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+</context>
+<context>
+ <name>OCC::Flow2Auth</name>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="113"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="231"/>
+ <source>Error returned from the server: <em>%1</em></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="382"/>
- <source>%1 has been downloaded.</source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
+ <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
+ <source>The reply from the server did not contain all expected fields</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
+ <source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>OCC::Flow2AuthWidget</name>
+ <message>
+ <location filename="../src/gui/wizard/flow2authwidget.cpp" line="98"/>
+ <source>Unable to open the Browser, please copy the link to your Browser.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/flow2authwidget.cpp" line="161"/>
+ <source>Waiting for authorization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/flow2authwidget.cpp" line="166"/>
+ <source>Polling for authorization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/flow2authwidget.cpp" line="171"/>
+ <source>Starting authorization</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/flow2authwidget.cpp" line="175"/>
+ <source>Link copied to clipboard.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/flow2authwidget.cpp" line="222"/>
+ <source>Open Browser</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/flow2authwidget.cpp" line="224"/>
+ <source>Copy Link</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>OCC::Folder</name>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="389"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="396"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="403"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="373"/>
+ <location filename="../src/gui/folder.cpp" line="450"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="198"/>
+ <source>Please choose a different location. The folder %1 doesn't exist.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="200"/>
+ <source>Please choose a different location. %1 isn't a valid folder.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="202"/>
+ <source>Please choose a different location. %1 isn't a readable folder.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="380"/>
- <source>%1 and %n other file(s) have been downloaded.</source>
+ <location filename="../src/gui/folder.cpp" line="457"/>
+ <source>%1 and %n other file(s) have been added.</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="459"/>
+ <source>%1 has been added.</source>
+ <comment>%1 names a file.</comment>
+ <translation type="unfinished"></translation>
+ </message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -790,7 +2110,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="394"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -798,7 +2118,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="401"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -806,7 +2126,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="408"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -814,12 +2134,12 @@
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="410"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -827,12 +2147,12 @@
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="417"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="422"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) are currently locked.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -840,49 +2160,75 @@
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="424"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 is currently locked.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="432"/>
+ <location filename="../src/gui/folder.cpp" line="509"/>
<source>Sync Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="643"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="972"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="975"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1031"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
+ <source>A folder has surpassed the set folder size limit of %1MB: %2.
+%3</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
+ <source>Keep syncing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
+ <source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
+ <source>Would you like to stop syncing this folder?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1034"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1045"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -891,175 +2237,232 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1090"/>
- <source>All files in the sync folder '%1' were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
-If you decide to restore the files, they will be re-synced with the server if you have rights to do so.
-If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
+ <source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1095"/>
- <source>All files got deleted from your local sync folder '%1'.
-These files will be deleted from the server and will not be available on your other devices if they will not be restored.
-If this action was unintended you can restore the lost data now.</source>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
+ <source>A large number of files in the server have been deleted.
+Please confirm if you'd like to proceed with these deletions.
+Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1099"/>
- <source>Delete all files?</source>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
+ <source>A large number of files in your local '%1' folder have been deleted.
+Please confirm if you'd like to proceed with these deletions.
+Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1102"/>
- <source>Delete all files</source>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
+ <source>Remove all files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1103"/>
- <source>Restore deleted files</source>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
+ <source>Proceed with Deletion</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1120"/>
- <source>This sync would reset the files to an earlier time in the sync folder '%1'.
-This might be because a backup was restored on the server.
-Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
+ <source>Restore Files to Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1125"/>
- <source>Backup detected</source>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
+ <source>Restore Files from Server</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>OCC::FolderCreationDialog</name>
<message>
- <location filename="../src/gui/folder.cpp" line="1128"/>
- <source>Normal Synchronisation</source>
+ <location filename="../src/gui/foldercreationdialog.ui" line="14"/>
+ <source>Create new folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1129"/>
- <source>Keep Local Files as Conflict</source>
+ <location filename="../src/gui/foldercreationdialog.ui" line="42"/>
+ <source>Enter folder name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/foldercreationdialog.ui" line="61"/>
+ <source>Folder already exists</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/foldercreationdialog.cpp" line="80"/>
+ <source>Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/foldercreationdialog.cpp" line="80"/>
+ <source>Could not create a folder! Check your write permissions.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="295"/>
+ <location filename="../src/gui/folderman.cpp" line="427"/>
<source>Could not reset folder state</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="296"/>
- <source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <location filename="../src/gui/folderman.cpp" line="1438"/>
+ <source> (backup)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1044"/>
- <source> (backup)</source>
+ <location filename="../src/gui/folderman.cpp" line="1443"/>
+ <source> (backup %1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1049"/>
- <source> (backup %1)</source>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1294"/>
- <source>Undefined State.</source>
+ <location filename="../src/gui/folderman.cpp" line="1783"/>
+ <source>Undefined state.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1297"/>
+ <location filename="../src/gui/folderman.cpp" line="1786"/>
<source>Waiting to start syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1300"/>
+ <location filename="../src/gui/folderman.cpp" line="1789"/>
<source>Preparing for sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1303"/>
+ <location filename="../src/gui/folderman.cpp" line="1799"/>
+ <source>Syncing %1 of %2 (A few seconds left)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1802"/>
+ <source>Syncing %1 of %2 (%3 left)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1805"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1811"/>
+ <source>Syncing %1 (A few seconds left)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1813"/>
+ <source>Syncing %1 (%2 left)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1816"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1821"/>
<source>Sync is running.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1308"/>
- <source>Sync was successful, unresolved conflicts.</source>
+ <location filename="../src/gui/folderman.cpp" line="1826"/>
+ <source>Sync finished with unresolved conflicts.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1310"/>
- <source>Last Sync was successful.</source>
+ <location filename="../src/gui/folderman.cpp" line="1828"/>
+ <source>Last sync was successful.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1316"/>
- <source>Setup Error.</source>
+ <location filename="../src/gui/folderman.cpp" line="1834"/>
+ <source>Setup error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1319"/>
- <source>User Abort.</source>
+ <location filename="../src/gui/folderman.cpp" line="1837"/>
+ <source>Sync request was cancelled.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
- <source>Sync is paused.</source>
+ <location filename="../src/gui/folderman.cpp" line="1854"/>
+ <source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
- <source>%1 (Sync is paused)</source>
+ <location filename="../src/gui/folderman.cpp" line="1862"/>
+ <location filename="../src/gui/folderman.cpp" line="1941"/>
+ <source>Please choose a different location. %1 is already being used as a sync folder.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1871"/>
+ <source>Please choose a different location. The path %1 doesn't exist.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1336"/>
- <source>No valid folder selected!</source>
+ <location filename="../src/gui/folderman.cpp" line="1875"/>
+ <source>Please choose a different location. The path %1 isn't a folder.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1346"/>
- <source>The selected path is not a folder!</source>
+ <location filename="../src/gui/folderman.cpp" line="1883"/>
+ <location filename="../src/gui/folderman.cpp" line="1888"/>
+ <source>Please choose a different location. You don't have enough permissions to write to %1.</source>
+ <comment>folder location</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1350"/>
- <source>You have no permission to write to the selected folder!</source>
+ <location filename="../src/gui/folderman.cpp" line="1948"/>
+ <source>Please choose a different location. %1 is already contained in a folder used as a sync folder.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1406"/>
- <source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
+ <location filename="../src/gui/folderman.cpp" line="1963"/>
+ <source>Please choose a different location. %1 is already being used as a sync folder for %2.</source>
+ <comment>folder location, server url</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1386"/>
- <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
+ <location filename="../src/gui/folderman.cpp" line="2100"/>
+ <source>The folder %1 is linked to multiple accounts.
+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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1392"/>
- <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="48"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="55"/>
<source>Add Folder Sync Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="256"/>
- <source>Synchronized with local folder (%1)</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="313"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="297"/>
<source>File</source>
<translation type="unfinished"></translation>
</message>
@@ -1067,139 +2470,146 @@
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="144"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="160"/>
<source>You need to be connected to add a folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="146"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="162"/>
<source>Click this button to add a folder to synchronize.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="155"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="157"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="175"/>
+ <source>Could not decrypt!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="177"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
<source>%1 (%2)</source>
- <extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="186"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="220"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="239"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
+ <source>Virtual file support is enabled.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="284"/>
<source>Signed out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="215"/>
- <source>There are unresolved conflicts. Click for details.</source>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="328"/>
+ <source>Synchronizing virtual files in local folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
- <source>Reconciling changes</source>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="330"/>
+ <source>Synchronizing files in local folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="967"/>
- <source>, '%1'</source>
- <extracomment>Build a list of file names</extracomment>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/>
+ <source>Checking for changes in remote "%1"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
- <source>'%1'</source>
- <extracomment>Argument is a file name</extracomment>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/>
+ <source>Checking for changes in local "%1"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="994"/>
- <source>Syncing %1</source>
- <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1014"/>
+ <source>Syncing local and remote changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1007"/>
- <source>, </source>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1064"/>
+ <source>%1 %2 ?</source>
+ <extracomment>Example text: "Uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s" Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/>
- <source>download %1/s</source>
- <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
- <source>upload %1/s</source>
- <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="921"/>
- <source>Checking for changes in remote '%1'</source>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="189"/>
- <source>Fetching folder list from server ?</source>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
+ <source>, </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
- <source>Checking for changes in local '%1'</source>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
<source>? %1/s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1012"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1080"/>
+ <source>Upload %1/s</source>
+ <extracomment>Example text: "Upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/>
<source>? %1/s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1018"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1088"/>
<source>%1 %2 (%3 of %4)</source>
- <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
+ <extracomment>Example text: "Uploading foobar.png (2MB of 2MB)"</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1022"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1094"/>
<source>%1 %2</source>
- <extracomment>Example text: "uploading foobar.png"</extracomment>
+ <extracomment>Example text: "Uploading foobar.png"</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1041"/>
- <source>%5 left, %1 of %2, file %3 of %4</source>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1115"/>
+ <source>A few seconds left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1049"/>
- <source>%1 of %2, file %3 of %4</source>
- <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1056"/>
- <source>file %1 of %2</source>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1120"/>
+ <source>%5 left, %1 of %2, file %3 of %4</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1102"/>
- <source>Waiting ?</source>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1129"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1104"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>Waiting for %n other folder(s) ?</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -1207,15 +2617,28 @@
</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1110"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>About to start syncing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>OCC::FolderWatcher</name>
+ <message>
+ <location filename="../src/gui/folderwatcher.cpp" line="132"/>
+ <source>The watcher did not receive a test notification.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>OCC::FolderWatcherPrivate</name>
<message>
- <location filename="../src/gui/folderwatcher_linux.cpp" line="87"/>
+ <location filename="../src/gui/folderwatcher_linux.cpp" line="88"/>
<source>This problem usually happens when the inotify watches are exhausted. Check the FAQ for details.</source>
<translation type="unfinished"></translation>
</message>
@@ -1223,12 +2646,12 @@
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="550"/>
+ <location filename="../src/gui/folderwizard.cpp" line="693"/>
<source>Add Folder Sync Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="552"/>
+ <location filename="../src/gui/folderwizard.cpp" line="695"/>
<source>Add Sync Connection</source>
<translation type="unfinished"></translation>
</message>
@@ -1236,17 +2659,17 @@
<context>
<name>OCC::FolderWizardLocalPath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="67"/>
+ <location filename="../src/gui/folderwizard.cpp" line="85"/>
<source>Click to select a local folder to sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="74"/>
+ <location filename="../src/gui/folderwizard.cpp" line="92"/>
<source>Enter the path to the local folder.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="135"/>
+ <location filename="../src/gui/folderwizard.cpp" line="153"/>
<source>Select the source folder</source>
<translation type="unfinished"></translation>
</message>
@@ -1254,83 +2677,97 @@
<context>
<name>OCC::FolderWizardRemotePath</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="183"/>
+ <location filename="../src/gui/folderwizard.cpp" line="224"/>
<source>Create Remote Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="184"/>
- <source>Enter the name of the new folder to be created below '%1':</source>
+ <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <source>Enter the name of the new folder to be created below "%1":</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="214"/>
+ <location filename="../src/gui/folderwizard.cpp" line="254"/>
<source>Folder was successfully created on %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="225"/>
+ <location filename="../src/gui/folderwizard.cpp" line="264"/>
<source>Authentication failed accessing %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="227"/>
+ <location filename="../src/gui/folderwizard.cpp" line="266"/>
<source>Failed to create the folder on %1. Please check manually.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="236"/>
+ <location filename="../src/gui/folderwizard.cpp" line="284"/>
<source>Failed to list a folder. Error: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="317"/>
+ <location filename="../src/gui/folderwizard.cpp" line="365"/>
<source>Choose this to sync the entire account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="447"/>
- <source>This folder is already being synced.</source>
+ <location filename="../src/gui/folderwizard.cpp" line="505"/>
+ <location filename="../src/gui/folderwizard.cpp" line="510"/>
+ <location filename="../src/gui/folderwizard.cpp" line="515"/>
+ <source>Please choose a different location. %1 is already being synced to %2.</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
- <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source>
+ <location filename="../src/gui/folderwizard.cpp" line="576"/>
+ <location filename="../src/gui/folderwizard.cpp" line="613"/>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="576"/>
+ <location filename="../src/gui/folderwizard.cpp" line="613"/>
+ <source>(experimental)</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>OCC::FormatWarningsWizardPage</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="48"/>
- <source><b>Warning:</b> %1</source>
+ <location filename="../src/gui/folderwizard.cpp" line="609"/>
+ <source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="50"/>
- <source><b>Warning:</b></source>
+ <location filename="../src/gui/folderwizard.cpp" line="634"/>
+ <source>Virtual files are not supported at the selected location</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="181"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="192"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="188"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="199"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="215"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="210"/>
+ <source>We received an unexpected download Content-Length.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="238"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="325"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="364"/>
<source>Connection Timeout</source>
<translation type="unfinished"></translation>
</message>
@@ -1338,112 +2775,262 @@
<context>
<name>OCC::GeneralSettings</name>
<message>
- <location filename="../src/gui/generalsettings.ui" line="41"/>
- <source>Legal notice</source>
+ <location filename="../src/gui/generalsettings.ui" line="20"/>
+ <source>General Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="66"/>
- <source>General Settings</source>
+ <location filename="../src/gui/generalsettings.ui" line="33"/>
+ <source>Show Call Notifications</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="72"/>
+ <location filename="../src/gui/generalsettings.ui" line="40"/>
<source>For System Tray</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="89"/>
- <source>Show Server &Notifications</source>
+ <location filename="../src/gui/generalsettings.ui" line="50"/>
+ <source>Show Chat Notifications</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="163"/>
- <source>Advanced</source>
+ <location filename="../src/gui/generalsettings.ui" line="57"/>
+ <source>Show Server &Notifications</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="195"/>
- <source>Ask for confirmation before synchronizing folders larger than</source>
+ <location filename="../src/gui/generalsettings.ui" line="67"/>
+ <source>Advanced</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="215"/>
+ <location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="239"/>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
<source>Ask for confirmation before synchronizing external storages</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="82"/>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="75"/>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
<source>Use &Monochrome Icons</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="143"/>
+ <source>Notify when synchronised folders grow larger than specified limit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="170"/>
+ <source>Automatically disable synchronisation of folders that overcome limit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="194"/>
+ <source>Move removed files to trash</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="205"/>
+ <source>Show sync folders in &Explorer's navigation pane</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="234"/>
+ <source>Server poll interval</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="254"/>
+ <source>seconds (if <a href="https://github.com/nextcloud/notify_push">Client Push</a> is unavailable)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="288"/>
<source>Edit &Ignored Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="250"/>
- <source>Show sync folders in &Explorer's Navigation Pane</source>
+ <location filename="../src/gui/generalsettings.ui" line="295"/>
+ <location filename="../src/gui/generalsettings.cpp" line="606"/>
+ <source>Create Debug Archive</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="267"/>
- <source>S&how crash reporter</source>
+ <location filename="../src/gui/generalsettings.ui" line="320"/>
+ <source>Info</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="20"/>
- <location filename="../src/gui/generalsettings.ui" line="32"/>
- <source>About</source>
+ <location filename="../src/gui/generalsettings.ui" line="335"/>
+ <source>Desktop client x.x.x</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="359"/>
+ <source>Update channel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="412"/>
+ <source>&Automatically check for updates</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="428"/>
+ <source>Check Now</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="99"/>
- <source>Updates</source>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Usage Documentation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="124"/>
+ <location filename="../src/gui/generalsettings.ui" line="462"/>
+ <source>Legal Notice</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="222"/>
+ <source>S&how crash reporter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
<source>&Restart && Update</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.cpp" line="56"/>
+ <location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="200"/>
+ <source>Show chat notification dialogs.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="204"/>
+ <source>Show call notification dialogs.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="218"/>
+ <source>You cannot disable autostart because system-wide autostart is enabled.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="413"/>
+ <source>stable</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="417"/>
+ <source>beta</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="421"/>
+ <source>daily</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="425"/>
+ <source>enterprise</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="453"/>
+ <source>- beta: contains versions with new features that may not be tested thoroughly
+- daily: contains versions created daily only for testing and development
+
+Downgrading versions is not possible immediately: changing from beta to stable means waiting for the new stable version.</source>
+ <comment>list of available update channels to non enterprise users and downgrading warning</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="458"/>
+ <source>- enterprise: contains stable versions for customers.
+
+Downgrading versions is not possible immediately: changing from stable to enterprise means waiting for the new enterprise version.</source>
+ <comment>list of available update channels to enterprise users and downgrading warning</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="465"/>
+ <source>Changing update channel?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="466"/>
+ <source>The channel determines which upgrades will be offered to install:
+- stable: contains tested versions considered reliable
+</source>
+ <comment>starts list of available update channels, stable is always available</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="472"/>
+ <source>Change update channel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="473"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="608"/>
+ <source>Zip Archives</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="618"/>
+ <source>Debug Archive Created</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="619"/>
+ <source>Debug archive is created at %1</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="556"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="817"/>
<source>Password for share required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="557"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="818"/>
<source>Please enter a password for your link share:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="576"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="844"/>
<source>Sharing error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="577"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="845"/>
<source>Could not retrieve or create the public link share. Error:
%1</source>
@@ -1453,22 +3040,22 @@
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="100"/>
- <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="62"/>
+ <source>Please enter %1 password:<br><br>Username: %2<br>Account: %3<br></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="114"/>
- <source>Reading from keychain failed with error: '%1'</source>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="76"/>
+ <source>Reading from keychain failed with error: "%1"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="120"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="83"/>
<source>Enter Password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="156"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="120"/>
<source><a href="%1">Click here</a> to request an app password from the web interface.</source>
<translation type="unfinished"></translation>
</message>
@@ -1497,7 +3084,7 @@
</message>
<message>
<location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
- <source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
+ <source>This entry is provided by the system at "%1" and cannot be modified in this view.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -1542,7 +3129,7 @@
</message>
<message>
<location filename="../src/gui/ignorelisttablewidget.cpp" line="94"/>
- <source>Cannot write changes to '%1'.</source>
+ <source>Cannot write changes to "%1".</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1557,24 +3144,148 @@
</message>
</context>
<context>
+ <name>OCC::InvalidFilenameDialog</name>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.ui" line="14"/>
+ <source>Invalid filename</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.ui" line="23"/>
+ <source>The file could not be synced because it contains characters which are not allowed on this system.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.ui" line="39"/>
+ <source>Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.ui" line="55"/>
+ <source>Please enter a new name for the file:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.ui" line="71"/>
+ <source>New filename</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
+ <source>Rename file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
+ <source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
+ <source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
+ <source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
+ <source>The following characters are not allowed: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
+ <source>The following basenames are not allowed: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
+ <source>The following filenames are not allowed: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
+ <source>The following file extensions are not allowed: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
+ <source>Checking rename permissions ?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
+ <source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
+ <source>Failed to fetch permissions with error %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
+ <source>Filename contains leading and trailing spaces.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
+ <source>Filename contains leading spaces.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
+ <source>Use invalid name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
+ <source>Filename contains illegal characters: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
+ <source>Could not rename file. Please make sure you are connected to the server.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
+ <source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
+ <source>Could not rename local file. %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>OCC::LegalNotice</name>
<message>
- <location filename="../src/gui/legalnotice.ui" line="26"/>
+ <location filename="../src/gui/legalnotice.ui" line="14"/>
+ <location filename="../src/gui/legalnotice.ui" line="25"/>
<source>Legal notice</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/legalnotice.ui" line="58"/>
+ <location filename="../src/gui/legalnotice.ui" line="57"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/legalnotice.cpp" line="27"/>
- <source><p>Copyright 2017-2020 Nextcloud GmbH<br />Copyright 2012-2018 ownCloud GmbH</p></source>
+ <location filename="../src/gui/legalnotice.cpp" line="55"/>
+ <source><p>Copyright 2017-2025 Nextcloud GmbH<br />Copyright 2012-2023 ownCloud GmbH</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/legalnotice.cpp" line="30"/>
+ <location filename="../src/gui/legalnotice.cpp" line="58"/>
<source><p>Licensed under the GNU General Public License (GPL) Version 2.0 or any later version.</p></source>
<translation type="unfinished"></translation>
</message>
@@ -1582,110 +3293,126 @@
<context>
<name>OCC::LogBrowser</name>
<message>
- <location filename="../src/gui/logbrowser.cpp" line="58"/>
+ <location filename="../src/gui/logbrowser.cpp" line="44"/>
<source>Log Output</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/logbrowser.cpp" line="70"/>
- <source>&Search:</source>
+ <location filename="../src/gui/logbrowser.cpp" line="50"/>
+ <source>The client can write debug logs to a temporary folder. These logs are very helpful for diagnosing problems.
+Since log files can get large, the client will start a new one for each sync run and compress older ones. It will also delete log files after a couple of hours to avoid consuming too much disk space.
+If enabled, logs will be written to %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/logbrowser.cpp" line="78"/>
- <source>&Find</source>
+ <location filename="../src/gui/logbrowser.cpp" line="64"/>
+ <source>Enable logging to temporary folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/logbrowser.cpp" line="89"/>
- <source>&Capture debug messages</source>
+ <location filename="../src/gui/logbrowser.cpp" line="70"/>
+ <source>This setting persists across client restarts.
+Note that using any logging command line options will override this setting.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/logbrowser.cpp" line="101"/>
- <source>Permanently save logs</source>
+ <location filename="../src/gui/logbrowser.cpp" line="77"/>
+ <source>Open folder</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>OCC::Logger</name>
<message>
- <location filename="../src/gui/logbrowser.cpp" line="103"/>
- <source>When this option is enabled and no other logging is configured, logs will be written to a temporary folder and expire after a few hours. This setting persists across client restarts.
-
-Logs will be written to %1</source>
+ <location filename="../src/libsync/logger.cpp" line="370"/>
+ <location filename="../src/libsync/logger.cpp" line="400"/>
+ <source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/logbrowser.cpp" line="115"/>
- <source>Clear</source>
+ <location filename="../src/libsync/logger.cpp" line="371"/>
+ <location filename="../src/libsync/logger.cpp" line="401"/>
+ <source><nobr>File "%1"<br/>cannot be opened for writing.<br/><br/>The log output <b>cannot</b> be saved!</nobr></source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>OCC::Mac::FileProviderEditLocallyJob</name>
<message>
- <location filename="../src/gui/logbrowser.cpp" line="116"/>
- <source>Clear the log display.</source>
+ <location filename="../src/gui/macOS/fileprovidereditlocallyjob.cpp" line="42"/>
+ <source>Could not start editing locally.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/logbrowser.cpp" line="122"/>
- <source>S&ave</source>
+ <location filename="../src/gui/macOS/fileprovidereditlocallyjob.cpp" line="42"/>
+ <source>An error occurred during setup.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/logbrowser.cpp" line="123"/>
- <source>Save the log file to a file on disk for debugging.</source>
+ <location filename="../src/gui/macOS/fileprovidereditlocallyjob.cpp" line="48"/>
+ <source>Could not find a file for local editing. Make sure its path is valid and it is synced locally.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/logbrowser.cpp" line="212"/>
- <source>Save log file</source>
+ <location filename="../src/gui/macOS/fileprovidereditlocallyjob.cpp" line="81"/>
+ <source>Could not get file ID.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/logbrowser.cpp" line="222"/>
- <source>Error</source>
+ <location filename="../src/gui/macOS/fileprovidereditlocallyjob.cpp" line="89"/>
+ <source>Could not get file identifier.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/logbrowser.cpp" line="222"/>
- <source>Could not write to log file %1</source>
+ <location filename="../src/gui/macOS/fileprovidereditlocallyjob.cpp" line="89"/>
+ <source>The file identifier is empty.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>OCC::Logger</name>
+ <name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="162"/>
- <source>Error</source>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="408"/>
+ <source>New Version Available</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
- <source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="414"/>
+ <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>OCC::NSISUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="332"/>
- <source>New Version Available</source>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
+ <source>Update Failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="338"/>
- <source><p>A new version of the %1 Client is available.</p><p><b>%2</b> is available for download. The installed version is %3.</p></source>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
+ <source><p>A new version of the %1 Client is available but the updating process failed.</p><p><b>%2</b> has been downloaded. The installed version is %3. If you confirm restart and update, your computer may reboot to complete the installation.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="352"/>
- <source>Skip this version</source>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="474"/>
+ <source>Ask again later</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="353"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="475"/>
+ <source>Restart and update</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="476"/>
+ <source>Update manually</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
<source>Skip this time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="354"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
<source>Get update</source>
<translation type="unfinished"></translation>
</message>
@@ -1693,194 +3420,177 @@
<context>
<name>OCC::NetworkSettings</name>
<message>
- <location filename="../src/gui/networksettings.ui" line="23"/>
+ <location filename="../src/gui/networksettings.ui" line="45"/>
<source>Proxy Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="29"/>
- <source>No Proxy</source>
+ <location filename="../src/gui/networksettings.ui" line="51"/>
+ <source>Use system proxy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="42"/>
- <source>Use system proxy</source>
+ <location filename="../src/gui/networksettings.ui" line="110"/>
+ <source>Host</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="52"/>
- <source>Specify proxy manually as</source>
+ <location filename="../src/gui/networksettings.ui" line="161"/>
+ <source>Proxy server requires authentication</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="80"/>
- <source>Host</source>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="100"/>
- <source>:</source>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="131"/>
- <source>Proxy server requires authentication</source>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="190"/>
- <source>Download Bandwidth</source>
+ <location filename="../src/gui/networksettings.ui" line="224"/>
+ <source>Note: proxy settings have no effects for accounts on localhost</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="196"/>
- <location filename="../src/gui/networksettings.ui" line="275"/>
- <source>Limit to</source>
+ <location filename="../src/gui/networksettings.ui" line="249"/>
+ <source>Manually specify proxy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="241"/>
- <location filename="../src/gui/networksettings.ui" line="320"/>
- <source>KBytes/s</source>
+ <location filename="../src/gui/networksettings.ui" line="259"/>
+ <source>No proxy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="292"/>
+ <location filename="../src/gui/networksettings.ui" line="285"/>
+ <location filename="../src/gui/networksettings.ui" line="400"/>
+ <location filename="../src/gui/networksettings.ui" line="510"/>
+ <source>Use global settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="330"/>
+ <location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="250"/>
- <location filename="../src/gui/networksettings.ui" line="282"/>
+ <location filename="../src/gui/networksettings.ui" line="390"/>
+ <location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="269"/>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
<source>Upload Bandwidth</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="253"/>
- <location filename="../src/gui/networksettings.ui" line="285"/>
+ <location filename="../src/gui/networksettings.ui" line="393"/>
+ <location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/networksettings.cpp" line="37"/>
+ <location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/networksettings.cpp" line="38"/>
+ <location filename="../src/gui/networksettings.cpp" line="51"/>
<source>Username for proxy server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/networksettings.cpp" line="39"/>
+ <location filename="../src/gui/networksettings.cpp" line="52"/>
<source>Password for proxy server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/networksettings.cpp" line="41"/>
+ <location filename="../src/gui/networksettings.cpp" line="54"/>
<source>HTTP(S) proxy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/networksettings.cpp" line="42"/>
+ <location filename="../src/gui/networksettings.cpp" line="55"/>
<source>SOCKS5 proxy</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>OCC::OAuth</name>
- <message>
- <location filename="../src/gui/creds/oauth.cpp" line="112"/>
- <source>Error returned from the server: <em>%1</em></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/creds/oauth.cpp" line="115"/>
- <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/creds/oauth.cpp" line="118"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/creds/oauth.cpp" line="121"/>
- <source>The reply from the server did not contain all expected fields</source>
- <translation type="unfinished"></translation>
- </message>
+ <name>OCC::OCUpdater</name>
<message>
- <location filename="../src/gui/creds/oauth.cpp" line="125"/>
- <source><h1>Login Error</h1><p>%1</p></source>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/creds/oauth.cpp" line="131"/>
- <source><h1>Wrong user</h1><p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>Please log out of %3 in another tab, then <a href='%4'>click here</a> and log in as user %2</p></source>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>OCC::OCUpdater</name>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
- <source>New %1 Update Ready</source>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
+ <source>New %1 update ready</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="104"/>
- <source>A new update for %1 is about to be installed. The updater may ask
-for additional privileges during the process.</source>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="108"/>
+ <source>A new update for %1 is about to be installed. The updater may ask for additional privileges during the process. Your computer may reboot to complete the installation.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Downloading version %1. Please wait ?</source>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="152"/>
+ <source>Downloading %1 ?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="147"/>
- <source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="154"/>
+ <source>%1 available. Restart application to start the update.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>Could not check for new updates.</source>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="157"/>
+ <source>Could not download update. Please open <a href='%1'>%1</a> to download the update manually.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
- <source>New %1 version %2 is available. Please click <a href='%3'>here</a> to download the update.</source>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="159"/>
+ <source>Could not download update. Please open %1 to download the update manually.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="153"/>
- <source>Checking update server ?</source>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
+ <source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
- <source>%1 version %2 available. Restart application to start the update.</source>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="167"/>
+ <source>New %1 is available. Please open %2 to download the update.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="155"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="159"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="178"/>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="195"/>
<source>Update Check</source>
<translation type="unfinished"></translation>
</message>
@@ -1888,56 +3598,75 @@
<context>
<name>OCC::OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="51"/>
- <source>Connect to %1</source>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="75"/>
+ <source>Connect</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="112"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="284"/>
+ <source>(experimental)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="127"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="286"/>
+ <source>Use &virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="52"/>
- <source>Setup local folder options</source>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
+ <source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="61"/>
- <source>Connect ?</source>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/>
+ <source>%1 folder "%2" is synced to local folder "%3"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
- <source>%1 folder '%2' is synced to local folder '%3'</source>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="322"/>
+ <source>Sync the folder "%1"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
- <source>Sync the folder '%1'</source>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="327"/>
+ <source>Warning: The local folder is not empty. Pick a resolution!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
- <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="340"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="658"/>
+ <source>%1 free space</source>
+ <comment>%1 gets replaced with the size and a matching unit. Example: 3 MB or 5 GB</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
- <source>Free space: %1</source>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="428"/>
+ <source>Virtual files are not supported at the selected location</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="299"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="491"/>
<source>Local Sync Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="342"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="534"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="575"/>
<source>(%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="389"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="601"/>
<source>There isn't enough free space in the local folder!</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="656"/>
+ <source>In Finder's "Locations" sidebar section</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>OCC::OwncloudConnectionMethodDialog</name>
@@ -1975,89 +3704,50 @@
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="48"/>
<source>&Email</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="59"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="58"/>
<source>Connect to %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="59"/>
<source>Enter user credentials</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>OCC::OwncloudOAuthCredsPage</name>
- <message>
- <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="45"/>
- <source>Connect to %1</source>
- <translation type="unfinished"></translation>
- </message>
+ <name>OCC::OwncloudPropagator</name>
<message>
- <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/>
- <source>Login in your browser</source>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="937"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
+ <source>Impossible to get modification time for file in conflict %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>OCC::OwncloudSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/>
- <source>Connect to %1</source>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="102"/>
+ <source>The link to your %1 web interface when you open it in the browser.</source>
+ <comment>%1 will be replaced with the application name</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="55"/>
- <source>Setup %1 server</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="83"/>
- <source>Keep your data secure and under your control</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="84"/>
- <source>Secure collaboration & file exchange</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="85"/>
- <source>Easy-to-use web mail, calendaring & contacts</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="86"/>
- <source>Screensharing, online meetings & web conferences</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="182"/>
- <source>This URL is NOT secure as it is not encrypted.
-It is not advisable to use it.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="186"/>
- <source>This URL is secure. You can use it.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="225"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="217"/>
<source>&Next ></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="285"/>
- <source>Invalid URL</source>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="260"/>
+ <source>Server address does not seem to be valid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="414"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="372"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation type="unfinished"></translation>
</message>
@@ -2065,149 +3755,159 @@
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="282"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="280"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="315"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="385"/>
- <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="407"/>
- <source>There was an invalid response to an authenticated webdav request</source>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="278"/>
- <source>Invalid URL</source>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
+ <source>Trying to connect to %1 at %2 ?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
- <source>The server reported the following error:</source>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <source>The authenticated request to the server was redirected to "%1". The URL is bad, the server is misconfigured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="334"/>
- <source>Trying to connect to %1 at %2 ?</source>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
+ <source>There was an invalid response to an authenticated WebDAV request</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="501"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="456"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="504"/>
<source>Creating local sync folder %1 ?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/>
- <source>ok</source>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="508"/>
+ <source>OK</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="462"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source>failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/>
<source>Could not create local folder %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="524"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="572"/>
<source>No remote folder specified!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="530"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="578"/>
<source>Error: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="543"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="591"/>
<source>creating folder on Nextcloud: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="559"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="596"/>
<source>Remote folder %1 created successfully.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="561"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="611"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="563"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="565"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="613"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="615"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="567"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="617"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="621"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="577"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="626"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="627"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="594"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="641"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="599"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="646"/>
<source>Successfully connected to %1!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="606"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="653"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="620"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="666"/>
<source>Folder rename failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="621"/>
- <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/>
+ <source>Cannot remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="696"/>
+ <source><font color="green"><b>File Provider-based account %1 successfully created!</b></font></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="668"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="701"/>
+ <source>Virtual files enabled</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="702"/>
+ <source>Your account is now syncing with virtual files support. This means that all your files are online-only by default, and will be downloaded on-demand when you open them. You may find your files under the <b>Locations</b> section of the Finder sidebar.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="745"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation type="unfinished"></translation>
</message>
@@ -2215,112 +3915,403 @@
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="94"/>
- <source>%1 Connection Wizard</source>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="104"/>
+ <source>Add %1 account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="103"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="108"/>
<source>Skip folders configuration</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>OCC::OwncloudWizardResultPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizardresultpage.cpp" line="36"/>
- <source>Everything set up!</source>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="109"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="491"/>
+ <source>Enable experimental feature?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="492"/>
+ <source>When the "virtual files" mode is enabled no files will be downloaded initially. Instead, a tiny "%1" file will be created for each file that exists on the server. The contents can be downloaded by running these files or by using their context menu.
+
+The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.
+
+Switching to this mode will abort any currently running synchronization.
+
+This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="506"/>
+ <source>Enable experimental placeholder mode</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizardresultpage.cpp" line="40"/>
- <source>Open Local Folder</source>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="507"/>
+ <source>Stay safe</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>OCC::PasswordInputDialog</name>
+ <message>
+ <location filename="../src/gui/passwordinputdialog.ui" line="23"/>
+ <source>Password for share required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizardresultpage.cpp" line="48"/>
- <source>Open %1 in Browser</source>
+ <location filename="../src/gui/passwordinputdialog.ui" line="35"/>
+ <source>Please enter a password for your share:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="140"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="149"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>OCC::ProcessDirectoryJob</name>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="399"/>
+ <source>Symbolic links are not supported in syncing.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
+ <source>File is listed on the ignore list.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
+ <source>File names ending with a period are not supported on this file system.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="433"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="436"/>
+ <location filename="../src/libsync/discovery.cpp" line="443"/>
+ <location filename="../src/libsync/discovery.cpp" line="450"/>
+ <location filename="../src/libsync/discovery.cpp" line="492"/>
+ <source>Cannot be renamed or uploaded.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="440"/>
+ <source>Filename contains leading spaces.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="447"/>
+ <source>Filename contains leading and trailing spaces.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="454"/>
+ <source>Filename is too long.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="458"/>
+ <source>File/Folder is ignored because it's hidden.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="461"/>
+ <source>Stat failed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="464"/>
+ <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="468"/>
+ <source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="472"/>
+ <source>The filename cannot be encoded on your file system.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="475"/>
+ <source>The filename is blacklisted on the server.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="478"/>
+ <source>Reason: the entire filename is forbidden.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="481"/>
+ <source>Reason: the filename has a forbidden base name (filename start).</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="484"/>
+ <source>Reason: the file has a forbidden extension (.%1).</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="487"/>
+ <source>Reason: the filename contains a forbidden character (%1).</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="635"/>
+ <source>File has extension reserved for virtual files.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="776"/>
+ <source>size</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="778"/>
+ <source>permission</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="782"/>
+ <source>file id</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="786"/>
+ <source>Server reported no %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <source>Cannot sync due to invalid modification time</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
+ <source>Could not upload file, because it is open in "%1".</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
+ <source>Error while deleting file record %1 from the database</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
+ <source>Moved to invalid target, restoring</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
+ <source>Cannot modify encrypted item because the selected certificate is not valid.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
+ <source>Ignored because of the "choose what to sync" blacklist</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
+ <source>Not allowed because you don't have permission to add subfolders to that folder</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
+ <source>Not allowed because you don't have permission to add files in that folder</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
+ <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
+ <source>Not allowed to remove, restoring</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
+ <source>Error while reading the database</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
+ <source>Server replied with an error while reading directory "%1" : %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="993"/>
- <source>Error writing metadata to the database</source>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
+ <source>Could not delete file %1 from local DB</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
+ <source>Error updating metadata due to invalid modification time</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
+ <source>The folder %1 cannot be made read-only: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
+ <source>unknown exception</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
+ <source>File is currently in use</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="357"/>
- <source>File %1 can not be downloaded because encryption information is missing.</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="461"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="478"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="427"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="518"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="543"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="477"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="706"/>
<source>The download would reduce free local disk space below the limit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="481"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="710"/>
<source>Free space on disk is less than %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="868"/>
<source>File was deleted from server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="654"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="940"/>
<source>The file could not be downloaded completely.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="661"/>
- <source>The downloaded file is empty despite that the server announced it should have been %1.</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="947"/>
+ <source>The downloaded file is empty, but the server said it should have been %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="850"/>
- <source>File %1 cannot be saved because of a local file name clash!</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1210"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1224"/>
+ <source>File %1 has invalid modified time reported by server. Do not save it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="885"/>
- <source>File has changed since discovery</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1297"/>
+ <source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="941"/>
- <source>Error writing metadata to the database</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1408"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1411"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="234"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="241"/>
<source>; Restoration Failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="312"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -2328,62 +4319,130 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="170"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="185"/>
- <source>Attention, possible case sensitivity clash with %1</source>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
+ <source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="191"/>
- <source>could not create folder %1</source>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
+ <source>Could not create folder %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="203"/>
- <source>Error writing metadata to the database</source>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
+ <source>The folder %1 cannot be made read-only: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
+ <source>unknown exception</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
+ <source>The file %1 is currently in use</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>OCC::PropagateLocalRemove</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="77"/>
- <source>Error removing '%1': %2;</source>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="105"/>
+ <source>Could not remove %1 because of a local file name clash</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="102"/>
- <source>Could not remove folder '%1'</source>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
+ <source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="123"/>
- <source>Could not remove %1 because of a local file name clash</source>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
+ <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="241"/>
- <source>File %1 can not be renamed to %2 because of a local file name clash</source>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
+ <source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="272"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
- <source>Error writing metadata to the database</source>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
+ <source>File %1 downloaded but it resulted in a local file name clash!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
+ <source>Error setting pin state</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
+ <source>Failed to propagate directory rename in hierarchy</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
+ <source>Failed to rename file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
+ <source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>OCC::PropagateRemoteDelete</name>
<message>
- <location filename="../src/libsync/propagateremotedelete.cpp" line="130"/>
+ <location filename="../src/libsync/propagateremotedelete.cpp" line="124"/>
+ <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateremotedelete.cpp" line="132"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>OCC::PropagateRemoteDeleteEncryptedRootFolder</name>
+ <message>
+ <location filename="../src/libsync/propagateremotedeleteencryptedrootfolder.cpp" line="158"/>
<source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source>
<translation type="unfinished"></translation>
</message>
@@ -2391,26 +4450,67 @@
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="99"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/>
- <source>Error writing metadata to the database</source>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
+ <source>Failed to encrypt a folder %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="283"/>
+ <source>Error writing metadata to the database: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="286"/>
+ <source>The file %1 is currently in use</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
+ <source>Could not rename %1 to %2, error: %3</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="166"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="172"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
+ <source>Error setting pin state</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"></translation>
</message>
@@ -2418,61 +4518,93 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="214"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="348"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="342"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="418"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="431"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="363"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="452"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="225"/>
- <location filename="../src/libsync/propagateupload.cpp" line="603"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="462"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="735"/>
+ <source>Unable to upload an item with invalid characters</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="837"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="840"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="334"/>
- <source>File Removed (start upload) %1</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="685"/>
- <source>Error writing metadata to the database</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
<message>
- <location filename="../src/libsync/propagateuploadng.cpp" line="404"/>
+ <location filename="../src/libsync/propagateuploadng.cpp" line="458"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateuploadng.cpp" line="415"/>
+ <location filename="../src/libsync/propagateuploadng.cpp" line="473"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateuploadng.cpp" line="449"/>
+ <location filename="../src/libsync/propagateuploadng.cpp" line="515"/>
+ <source>Poll URL missing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateuploadng.cpp" line="524"/>
<source>Unexpected return code from server (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateuploadng.cpp" line="456"/>
+ <location filename="../src/libsync/propagateuploadng.cpp" line="531"/>
<source>Missing File ID from server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateuploadng.cpp" line="470"/>
+ <location filename="../src/libsync/propagateuploadng.cpp" line="551"/>
<source>Missing ETag from server</source>
<translation type="unfinished"></translation>
</message>
@@ -2480,22 +4612,22 @@
<context>
<name>OCC::PropagateUploadFileV1</name>
<message>
- <location filename="../src/libsync/propagateuploadv1.cpp" line="213"/>
+ <location filename="../src/libsync/propagateuploadv1.cpp" line="236"/>
<source>Poll URL missing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/>
+ <location filename="../src/libsync/propagateuploadv1.cpp" line="260"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/>
+ <location filename="../src/libsync/propagateuploadv1.cpp" line="275"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/>
+ <location filename="../src/libsync/propagateuploadv1.cpp" line="289"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"></translation>
</message>
@@ -2531,7 +4663,7 @@
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="502"/>
<source>Choose What to Sync</source>
<translation type="unfinished"></translation>
</message>
@@ -2539,33 +4671,33 @@
<context>
<name>OCC::SelectiveSyncWidget</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="73"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="72"/>
<source>Loading ?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="79"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="78"/>
<source>Deselect remote folders you do not wish to synchronize.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="95"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="94"/>
<source>Name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="96"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="95"/>
<source>Size</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="308"/>
<source>No subfolders currently on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="310"/>
<source>An error occurred while loading the list of sub folders.</source>
<translation type="unfinished"></translation>
</message>
@@ -2573,8 +4705,8 @@
<context>
<name>OCC::ServerNotificationHandler</name>
<message>
- <location filename="../src/gui/tray/NotificationHandler.cpp" line="139"/>
- <source>Dismiss</source>
+ <location filename="../src/gui/tray/notificationhandler.cpp" line="133"/>
+ <source>Reply</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -2586,310 +4718,261 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="100"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="104"/>
+ <source>%1 Settings</source>
+ <extracomment>This name refers to the application name e.g Nextcloud</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/settingsdialog.cpp" line="122"/>
<source>General</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="109"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="137"/>
<source>Network</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="207"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="244"/>
<source>Account</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>OCC::ShareDialog</name>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="105"/>
- <source>%1 Sharing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="81"/>
- <source>%1</source>
- <translation type="unfinished"></translation>
- </message>
+ <name>OCC::ShareManager</name>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="102"/>
- <source>Folder: %2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="276"/>
- <source>The file can not be shared because it was shared without sharing permission.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="311"/>
- <source>Password for share required</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="312"/>
- <source>Please enter a password for your link share:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.ui" line="51"/>
- <source>share label</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.ui" line="82"/>
- <source>Nextcloud Path:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.ui" line="113"/>
- <source>Icon</source>
+ <location filename="../src/gui/sharemanager.cpp" line="716"/>
+ <source>Error</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>OCC::ShareLinkWidget</name>
- <message>
- <location filename="../src/gui/sharelinkwidget.ui" line="38"/>
- <source>Share link</source>
- <translation type="unfinished"></translation>
- </message>
+ <name>OCC::ShareModel</name>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="133"/>
- <source>Note:</source>
+ <location filename="../src/gui/filedetails/sharemodel.cpp" line="580"/>
+ <source>%1 days</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="192"/>
- <source>Password:</source>
+ <location filename="../src/gui/filedetails/sharemodel.cpp" line="582"/>
+ <source>1 day</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="245"/>
- <source>Expires:</source>
+ <location filename="../src/gui/filedetails/sharemodel.cpp" line="583"/>
+ <source>Today</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="470"/>
- <source>Delete</source>
+ <location filename="../src/gui/filedetails/sharemodel.cpp" line="757"/>
+ <source>Secure file drop link</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="158"/>
- <source>Allow Editing</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="164"/>
- <source>Read only</source>
+ <location filename="../src/gui/filedetails/sharemodel.cpp" line="757"/>
+ <source>Share link</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="169"/>
- <source>Allow Upload && Editing</source>
+ <location filename="../src/gui/filedetails/sharemodel.cpp" line="765"/>
+ <source>Link share</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="174"/>
- <source>File Drop (Upload Only)</source>
+ <location filename="../src/gui/filedetails/sharemodel.cpp" line="767"/>
+ <source>Internal link</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="189"/>
- <source>Add note to recipient</source>
+ <location filename="../src/gui/filedetails/sharemodel.cpp" line="769"/>
+ <source>Secure file drop</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="199"/>
- <source>Password Protect</source>
+ <location filename="../src/gui/filedetails/sharemodel.cpp" line="969"/>
+ <source>Could not find local folder for %1</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>OCC::ShareeModel</name>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="216"/>
- <source>Expiration Date</source>
+ <location filename="../src/gui/filedetails/shareemodel.cpp" line="33"/>
+ <location filename="../src/gui/filedetails/shareemodel.cpp" line="290"/>
+ <source>Search globally</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="235"/>
- <source>Unshare</source>
+ <location filename="../src/gui/filedetails/shareemodel.cpp" line="286"/>
+ <source>No results found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="240"/>
- <source>Add another link</source>
+ <location filename="../src/gui/filedetails/shareemodel.cpp" line="286"/>
+ <source>Global search results</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="463"/>
- <source>Confirm Link Share Deletion</source>
+ <location filename="../src/gui/filedetails/shareemodel.cpp" line="302"/>
+ <source>%1 (%2)</source>
+ <comment>sharee (shareWithAdditionalInfo)</comment>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="464"/>
- <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="471"/>
- <source>Cancel</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="489"/>
- <source>Public link</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>OCC::ShareUserGroupWidget</name>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="270"/>
- <source>Copy link</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="280"/>
- <source>No results for '%1'</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="367"/>
- <source>I shared something with you</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
+ <source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.ui" line="59"/>
- <source>Share with users or groups ?</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="552"/>
+ <source>The account %1 does not have end-to-end encryption configured. Please configure this in your account settings to enable folder encryption.</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>OCC::ShareUserLine</name>
<message>
- <location filename="../src/gui/shareuserline.ui" line="57"/>
- <source>Username</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/>
+ <source>Failed to encrypt folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/shareuserline.ui" line="89"/>
- <source>can edit</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/>
+ <source>Could not encrypt the following folder: "%1".
+
+Server replied with error: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="415"/>
- <source>Can reshare</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="579"/>
+ <source>Folder encrypted successfully</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="425"/>
- <source>Unshare</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="580"/>
+ <source>The following folder was encrypted successfully: "%1"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="434"/>
- <source>Can create</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
+ <source>Select new location ?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="440"/>
- <source>Can change</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
+ <source>Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/shareusergroupwidget.cpp" line="446"/>
- <source>Can delete</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
+ <source>Leave this share</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
- <source>Login Error</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1182"/>
+ <source>Resharing this file is not allowed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="259"/>
- <source>You must sign in as user %1</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1182"/>
+ <source>Resharing this folder is not allowed</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>OCC::ShibbolethWebView</name>
<message>
- <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="83"/>
- <source>%1 - Authenticate</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
+ <source>Encrypt</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="93"/>
- <source>SSL Cipher Debug View</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1237"/>
+ <source>Lock file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
- <source>Reauthentication required</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1240"/>
+ <source>Unlock file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/creds/shibboleth/shibbolethwebview.cpp" line="101"/>
- <source>Your session has expired. You need to re-login to continue to use the client.</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1255"/>
+ <source>Locked by %1</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>OCC::SocketApi</name>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="529"/>
- <source>Context menu share</source>
- <translation type="unfinished"></translation>
+ <message numerus="yes">
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1259"/>
+ <source>Expires in %1 minutes</source>
+ <comment>remaining time before lock expires</comment>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="668"/>
- <source>I shared something with you</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
+ <source>Resolve conflict ?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="681"/>
- <location filename="../src/gui/socketapi.cpp" line="711"/>
- <source>Share options</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1403"/>
+ <source>Move and rename ?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="684"/>
- <source>Send private link by email ?</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1406"/>
+ <source>Move, rename and upload ?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="683"/>
- <source>Copy private link to clipboard</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1408"/>
+ <source>Delete local changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="709"/>
- <source>Resharing this file is not allowed</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1414"/>
+ <source>Move and upload ?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="722"/>
- <location filename="../src/gui/socketapi.cpp" line="724"/>
- <source>Copy public link</source>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1415"/>
+ <source>Delete</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="728"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
<source>Copy internal link</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="782"/>
- <source>Edit</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi.cpp" line="784"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
<source>Open in browser</source>
<translation type="unfinished"></translation>
</message>
@@ -3032,67 +5115,72 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sslerrordialog.cpp" line="132"/>
+ <location filename="../src/gui/sslerrordialog.cpp" line="138"/>
<source>Cannot connect securely to <i>%1</i>:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sslerrordialog.cpp" line="166"/>
+ <location filename="../src/gui/sslerrordialog.cpp" line="157"/>
+ <source>Additional errors:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sslerrordialog.cpp" line="183"/>
<source>with Certificate %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sslerrordialog.cpp" line="175"/>
- <location filename="../src/gui/sslerrordialog.cpp" line="177"/>
- <location filename="../src/gui/sslerrordialog.cpp" line="179"/>
+ <location filename="../src/gui/sslerrordialog.cpp" line="192"/>
+ <location filename="../src/gui/sslerrordialog.cpp" line="194"/>
+ <location filename="../src/gui/sslerrordialog.cpp" line="196"/>
<source><not specified></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sslerrordialog.cpp" line="180"/>
- <location filename="../src/gui/sslerrordialog.cpp" line="205"/>
+ <location filename="../src/gui/sslerrordialog.cpp" line="197"/>
+ <location filename="../src/gui/sslerrordialog.cpp" line="222"/>
<source>Organization: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sslerrordialog.cpp" line="181"/>
- <location filename="../src/gui/sslerrordialog.cpp" line="206"/>
+ <location filename="../src/gui/sslerrordialog.cpp" line="198"/>
+ <location filename="../src/gui/sslerrordialog.cpp" line="223"/>
<source>Unit: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sslerrordialog.cpp" line="182"/>
- <location filename="../src/gui/sslerrordialog.cpp" line="207"/>
+ <location filename="../src/gui/sslerrordialog.cpp" line="199"/>
+ <location filename="../src/gui/sslerrordialog.cpp" line="224"/>
<source>Country: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sslerrordialog.cpp" line="189"/>
+ <location filename="../src/gui/sslerrordialog.cpp" line="206"/>
<source>Fingerprint (SHA1): <tt>%1</tt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sslerrordialog.cpp" line="194"/>
+ <location filename="../src/gui/sslerrordialog.cpp" line="211"/>
<source>Fingerprint (SHA-256): <tt>%1</tt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sslerrordialog.cpp" line="195"/>
+ <location filename="../src/gui/sslerrordialog.cpp" line="212"/>
<source>Fingerprint (SHA-512): <tt>%1</tt></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sslerrordialog.cpp" line="197"/>
+ <location filename="../src/gui/sslerrordialog.cpp" line="214"/>
<source>Effective Date: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sslerrordialog.cpp" line="198"/>
+ <location filename="../src/gui/sslerrordialog.cpp" line="215"/>
<source>Expiration Date: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sslerrordialog.cpp" line="202"/>
+ <location filename="../src/gui/sslerrordialog.cpp" line="219"/>
<source>Issuer: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -3100,358 +5188,586 @@
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="122"/>
- <source>Success.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <source>%1 (skipped due to earlier error, trying again in %2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="132"/>
- <source>A network connection timeout happened.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="135"/>
- <source>A HTTP transmission error happened.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="159"/>
- <source>The mounted folder is temporarily not available on the server</source>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="165"/>
- <source>An error occurred while opening a folder</source>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="168"/>
- <source>Error while reading folder.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="244"/>
- <source>%1 (skipped due to earlier error, trying again in %2)</source>
+ <location filename="../src/libsync/syncengine.cpp" line="383"/>
+ <source>Could not update file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="516"/>
- <source>File/Folder is ignored because it's hidden.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="412"/>
+ <source>Could not update virtual file metadata: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="519"/>
- <source>Folder hierarchy is too deep</source>
+ <location filename="../src/libsync/syncengine.cpp" line="419"/>
+ <source>Could not update file metadata: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="535"/>
- <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="433"/>
+ <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="800"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <location filename="../src/libsync/syncengine.cpp" line="616"/>
+ <source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="835"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="628"/>
+ <source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1393"/>
- <source>Not allowed because you don't have permission to add parent folder</source>
+ <location filename="../src/libsync/syncengine.cpp" line="668"/>
+ <source>Unable to read from the sync journal.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1400"/>
- <source>Not allowed because you don't have permission to add files in that folder</source>
+ <location filename="../src/libsync/syncengine.cpp" line="824"/>
+ <source>Cannot open the sync journal</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>OCC::SyncStatusSummary</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1733"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="126"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="343"/>
+ <source>Offline</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1740"/>
- <source>There is insufficient space available on the server for some uploads.</source>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="141"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="346"/>
+ <location filename="../src/gui/tray/syncstatussummary.h" line="94"/>
+ <source>All synced!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="150"/>
- <source>CSync unspecified error.</source>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="151"/>
+ <source>Some files couldn't be synced!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="153"/>
- <source>Aborted by the user</source>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="152"/>
+ <source>See below for errors</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
- <source>Failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="160"/>
+ <source>Checking folder changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="129"/>
- <source>Discovery step failed.</source>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="162"/>
+ <source>Syncing changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="138"/>
- <source>Permission denied.</source>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="171"/>
+ <source>Sync paused</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="141"/>
- <source>File or directory not found:</source>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="179"/>
+ <source>Some files could not be synced!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="144"/>
- <source>Tried to create a folder that already exists.</source>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="180"/>
+ <source>See below for warnings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="147"/>
- <source>No space on %1 server available.</source>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="221"/>
+ <source>Syncing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="156"/>
- <source>The service is temporarily unavailable</source>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="234"/>
+ <source>%1 of %2 ? %3 left</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="162"/>
- <source>Access is forbidden</source>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="238"/>
+ <source>%1 of %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
- <source>An internal error number %1 occurred.</source>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="243"/>
+ <source>Syncing file %1 of %2</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>OCC::Systray</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="485"/>
- <source>Symbolic links are not supported in syncing.</source>
+ <location filename="../src/gui/systray.cpp" line="86"/>
+ <source>Download</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
- <source>File is listed on the ignore list.</source>
+ <location filename="../src/gui/systray.cpp" line="185"/>
+ <source>Add account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="492"/>
- <source>File names ending with a period are not supported on this file system.</source>
+ <location filename="../src/gui/systray.cpp" line="187"/>
+ <source>Open main dialog</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="502"/>
- <source>File names containing the character '%1' are not supported on this file system.</source>
+ <location filename="../src/gui/systray.cpp" line="190"/>
+ <location filename="../src/gui/systray.cpp" line="200"/>
+ <source>Pause sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="505"/>
- <source>The file name is a reserved name on this file system.</source>
+ <location filename="../src/gui/systray.cpp" line="191"/>
+ <location filename="../src/gui/systray.cpp" line="206"/>
+ <source>Resume sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
- <source>Filename contains trailing spaces.</source>
+ <location filename="../src/gui/systray.cpp" line="192"/>
+ <source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="513"/>
- <source>Filename is too long.</source>
+ <location filename="../src/gui/systray.cpp" line="193"/>
+ <source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="522"/>
- <source>The filename cannot be encoded on your file system.</source>
+ <location filename="../src/gui/systray.cpp" line="194"/>
+ <source>Exit %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="531"/>
- <source>Unresolved conflict.</source>
+ <location filename="../src/gui/systray.cpp" line="200"/>
+ <source>Pause sync for all</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="539"/>
- <source>Stat failed.</source>
+ <location filename="../src/gui/systray.cpp" line="206"/>
+ <source>Resume sync for all</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>OCC::TermsOfServiceCheckWidget</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="566"/>
- <source>Filename encoding is not valid</source>
+ <location filename="../src/gui/wizard/termsofservicecheckwidget.cpp" line="134"/>
+ <source>Waiting for terms to be accepted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="730"/>
- <source>Invalid characters, please rename "%1"</source>
+ <location filename="../src/gui/wizard/termsofservicecheckwidget.cpp" line="140"/>
+ <source>Polling</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="863"/>
- <source>Unable to read the blacklist from the local database</source>
+ <location filename="../src/gui/wizard/termsofservicecheckwidget.cpp" line="146"/>
+ <source>Link copied to clipboard.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="904"/>
- <source>Unable to read from the sync journal.</source>
+ <location filename="../src/gui/wizard/termsofservicecheckwidget.cpp" line="187"/>
+ <source>Open Browser</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="967"/>
- <source>Cannot open the sync journal</source>
+ <location filename="../src/gui/wizard/termsofservicecheckwidget.cpp" line="189"/>
+ <source>Copy Link</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1033"/>
- <source>File name contains at least one invalid character</source>
+ <location filename="../src/libsync/theme.cpp" line="419"/>
+ <source>%1 Desktop Client Version %2 (%3)</source>
+ <comment>%1 is application name. %2 is the human version string. %3 is the operating system name.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1319"/>
- <location filename="../src/libsync/syncengine.cpp" line="1359"/>
- <source>Ignored because of the "choose what to sync" blacklist</source>
+ <location filename="../src/libsync/theme.cpp" line="611"/>
+ <source><p><small>Using virtual files plugin: %1</small></p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1378"/>
- <source>Not allowed because you don't have permission to add subfolders to that folder</source>
+ <location filename="../src/libsync/theme.cpp" line="629"/>
+ <source><p>This release was supplied by %1.</p></source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>OCC::UnifiedSearchResultsListModel</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1425"/>
- <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="405"/>
+ <source>Failed to fetch providers.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1441"/>
- <location filename="../src/libsync/syncengine.cpp" line="1460"/>
- <source>Not allowed to remove, restoring</source>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="416"/>
+ <source>Failed to fetch search providers for '%1'. Error: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1474"/>
- <source>Local files and share folder removed.</source>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="450"/>
+ <source>Search has failed for '%2'.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1528"/>
- <source>Move not allowed, item restored</source>
+ <location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="479"/>
+ <source>Search has failed for '%1'. Error: %2</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>OCC::UpdateE2eeFolderMetadataJob</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1539"/>
- <source>Move not allowed because %1 is read-only</source>
+ <location filename="../src/libsync/updatee2eefoldermetadatajob.cpp" line="132"/>
+ <source>Failed to update folder metadata.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1539"/>
- <source>the destination</source>
+ <location filename="../src/libsync/updatee2eefoldermetadatajob.cpp" line="155"/>
+ <source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1539"/>
- <source>the source</source>
+ <location filename="../src/libsync/updatee2eefoldermetadatajob.cpp" line="165"/>
+ <source>Failed to finalize item.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>OCC::SyncLogDialog</name>
+ <name>OCC::UpdateE2eeFolderUsersMetadataJob</name>
<message>
- <location filename="../src/gui/synclogdialog.ui" line="14"/>
- <source>Synchronisation Log</source>
+ <location filename="../src/libsync/updatee2eefolderusersmetadatajob.cpp" line="58"/>
+ <location filename="../src/libsync/updatee2eefolderusersmetadatajob.cpp" line="69"/>
+ <location filename="../src/libsync/updatee2eefolderusersmetadatajob.cpp" line="113"/>
+ <location filename="../src/libsync/updatee2eefolderusersmetadatajob.cpp" line="128"/>
+ <location filename="../src/libsync/updatee2eefolderusersmetadatajob.cpp" line="135"/>
+ <location filename="../src/libsync/updatee2eefolderusersmetadatajob.cpp" line="148"/>
+ <location filename="../src/libsync/updatee2eefolderusersmetadatajob.cpp" line="169"/>
+ <location filename="../src/libsync/updatee2eefolderusersmetadatajob.cpp" line="201"/>
+ <location filename="../src/libsync/updatee2eefolderusersmetadatajob.cpp" line="260"/>
+ <source>Error updating metadata for a folder %1</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>OCC::Systray</name>
<message>
- <location filename="../src/gui/systray.cpp" line="130"/>
- <source>%1: %2</source>
+ <location filename="../src/libsync/updatee2eefolderusersmetadatajob.cpp" line="90"/>
+ <source>Could not fetch public key for user %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/updatee2eefolderusersmetadatajob.cpp" line="97"/>
+ <source>Could not find root encrypted folder for folder %1</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="345"/>
- <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source>
+ <location filename="../src/libsync/updatee2eefolderusersmetadatajob.cpp" line="118"/>
+ <source>Could not add or remove user %1 to access folder %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="349"/>
- <source><p>This release was supplied by %1</p></source>
+ <location filename="../src/libsync/updatee2eefolderusersmetadatajob.cpp" line="238"/>
+ <source>Failed to unlock a folder.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>OCC::User</name>
<message>
- <location filename="../src/gui/tray/UserModel.cpp" line="319"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="103"/>
+ <source>End-to-end certificate needs to be migrated to a new one</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/usermodel.cpp" line="105"/>
+ <source>Trigger the migration</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/tray/usermodel.cpp" line="176"/>
+ <source>%n notification(s)</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/usermodel.cpp" line="673"/>
<source>Retry all uploads</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/tray/UserModel.cpp" line="368"/>
- <source>You renamed</source>
+ <location filename="../src/gui/tray/usermodel.cpp" line="724"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="886"/>
+ <source>Resolve conflict</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/tray/UserModel.cpp" line="370"/>
- <source>You deleted</source>
+ <location filename="../src/gui/tray/usermodel.cpp" line="876"/>
+ <source>Rename file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/tray/UserModel.cpp" line="372"/>
- <source>You created</source>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1082"/>
+ <source>Open Nextcloud Assistant in browser</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/tray/UserModel.cpp" line="374"/>
- <source>You changed</source>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1082"/>
+ <source>Open Nextcloud Talk in browser</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>OCC::UserModel</name>
<message>
- <location filename="../src/gui/tray/UserModel.cpp" line="688"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1487"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/tray/UserModel.cpp" line="689"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1488"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/tray/UserModel.cpp" line="694"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1492"/>
<source>Remove connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/tray/UserModel.cpp" line="695"/>
+ <location filename="../src/gui/tray/usermodel.cpp" line="1493"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
+ <name>OCC::UserStatusSelectorModel</name>
+ <message>
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="155"/>
+ <source>Could not fetch predefined statuses. Make sure you are connected to the server.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="159"/>
+ <source>Could not fetch status. Make sure you are connected to the server.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="163"/>
+ <source>Status feature is not supported. You will not be able to set your status.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="167"/>
+ <source>Emojis are not supported. Some status functionality may not work.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="171"/>
+ <source>Could not set status. Make sure you are connected to the server.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="175"/>
+ <source>Could not clear status message. Make sure you are connected to the server.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="360"/>
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="467"/>
+ <source>Don't clear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="363"/>
+ <source>30 minutes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="366"/>
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="421"/>
+ <source>1 hour</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="369"/>
+ <source>4 hours</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="372"/>
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="456"/>
+ <source>Today</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="375"/>
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="458"/>
+ <source>This week</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>Less than a minute</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
+ <source>1 minute</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
+ <source>%1 minutes</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
+ <source>%1 hours</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="428"/>
+ <source>1 day</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="430"/>
+ <source>%1 days</source>
+ <translation type="unfinished">
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+</context>
+<context>
+ <name>OCC::Vfs</name>
+ <message>
+ <location filename="../src/common/vfs.cpp" line="76"/>
+ <source>Please choose a different location. %1 is a drive. It doesn't support virtual files.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/common/vfs.cpp" line="80"/>
+ <source>Please choose a different location. %1 isn't a NTFS file system. It doesn't support virtual files.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/common/vfs.cpp" line="84"/>
+ <source>Please choose a different location. %1 is a network drive. It doesn't support virtual files.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>OCC::VfsDownloadErrorDialog</name>
+ <message>
+ <location filename="../src/gui/vfsdownloaderrordialog.ui" line="14"/>
+ <source>Download error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/vfsdownloaderrordialog.ui" line="23"/>
+ <source>Error downloading</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/vfsdownloaderrordialog.ui" line="39"/>
+ <source>could not be downloaded</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/vfsdownloaderrordialog.ui" line="61"/>
+ <source>> More details</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/vfsdownloaderrordialog.ui" line="68"/>
+ <source>More details</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/vfsdownloaderrordialog.cpp" line="26"/>
+ <source>Error downloading %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/vfsdownloaderrordialog.cpp" line="27"/>
+ <source>%1 could not be downloaded.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>OCC::VfsSuffix</name>
+ <message>
+ <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="80"/>
+ <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="91"/>
+ <source>Error updating metadata due to invalid modification time</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>OCC::VfsXAttr</name>
+ <message>
+ <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="75"/>
+ <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="86"/>
+ <source>Error updating metadata due to invalid modification time</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>OCC::WebEnginePage</name>
<message>
- <location filename="../src/gui/wizard/webview.cpp" line="208"/>
+ <location filename="../src/gui/wizard/webview.cpp" line="234"/>
<source>Invalid certificate detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/webview.cpp" line="209"/>
+ <location filename="../src/gui/wizard/webview.cpp" line="235"/>
<source>The host "%1" provided an invalid certificate. Continue?</source>
<translation type="unfinished"></translation>
</message>
@@ -3459,355 +5775,862 @@
<context>
<name>OCC::WebFlowCredentials</name>
<message>
- <location filename="../src/gui/creds/webflowcredentials.cpp" line="169"/>
- <source>You have been logged out of %1 as user %2. Please login again</source>
+ <location filename="../src/gui/creds/webflowcredentials.cpp" line="166"/>
+ <source>You have been logged out of your account %1 at %2. Please login again.</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>OCC::WelcomePage</name>
<message>
- <location filename="../src/gui/creds/webflowcredentials.cpp" line="189"/>
- <source>Please login with the user: %1</source>
+ <location filename="../src/gui/wizard/welcomepage.ui" line="20"/>
+ <source>Form</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>OCC::WebFlowCredentialsDialog</name>
<message>
- <location filename="../src/gui/creds/webflowcredentialsdialog.cpp" line="34"/>
+ <location filename="../src/gui/wizard/welcomepage.ui" line="143"/>
<source>Log in</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="289"/>
- <source>Please sign in</source>
+ <location filename="../src/gui/wizard/welcomepage.ui" line="156"/>
+ <source>Sign up with provider</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="335"/>
- <source>Folder %1: %2</source>
+ <location filename="../src/gui/wizard/welcomepage.cpp" line="68"/>
+ <source>Keep your data secure and under your control</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="353"/>
- <source>There are no sync folders configured.</source>
+ <location filename="../src/gui/wizard/welcomepage.cpp" line="69"/>
+ <source>Secure collaboration & file exchange</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="270"/>
- <source>Disconnected from %1</source>
+ <location filename="../src/gui/wizard/welcomepage.cpp" line="70"/>
+ <source>Easy-to-use web mail, calendaring & contacts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="220"/>
- <source>Unsupported Server Version</source>
+ <location filename="../src/gui/wizard/welcomepage.cpp" line="71"/>
+ <source>Screensharing, online meetings & web conferences</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="221"/>
- <source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
+ <location filename="../src/gui/wizard/welcomepage.cpp" line="111"/>
+ <source>Host your own server</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="260"/>
- <source>Disconnected</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="262"/>
- <source>Disconnected from some accounts</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="273"/>
- <source>Disconnected from accounts:</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
- <source>Account %1: %2</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <source>Unsupported Server Version</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="290"/>
- <source>Signed out</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
+ <source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="294"/>
- <source>Account synchronization is disabled</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
+ <source>Terms of service</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="295"/>
- <location filename="../src/gui/owncloudgui.cpp" line="348"/>
- <source>Synchronization is paused</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
+ <source>Your account %1 requires you to accept the terms of service of your server. You will be redirected to %2 to acknowledge that you have read it and agrees with it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="343"/>
- <source>Unresolved conflicts</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="452"/>
+ <source>%1: %2</source>
+ <extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="350"/>
- <source>Error during synchronization</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <source>macOS VFS for %1: Sync is running.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="354"/>
- <source>No sync folders configured</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="459"/>
+ <source>macOS VFS for %1: Last sync was successful.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="418"/>
- <source>Syncing %1 of %2 (%3 left)</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="462"/>
+ <source>macOS VFS for %1: A problem was encountered.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="423"/>
- <source>Syncing %1 of %2</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="528"/>
+ <source>Checking for changes in remote "%1"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="432"/>
- <source>Syncing %1 (%2 left)</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="531"/>
+ <source>Checking for changes in local "%1"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="435"/>
- <source>Syncing %1</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="445"/>
- <source>%1 (%2, %3)</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="345"/>
- <source>Up to date</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="548"/>
+ <source>%1 (%2, %3)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/>
- <source>Server</source>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
+ <source>Username</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="354"/>
- <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="116"/>
+ <source>Local Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="357"/>
- <source>Start a &clean sync (Erases the local folder!)</source>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="135"/>
+ <source>Choose different folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="148"/>
- <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="228"/>
+ <source>Server address</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="165"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="244"/>
+ <source>Sync Logo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="174"/>
- <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/>
+ <source>Synchronize everything from server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="198"/>
- <source>Choose what to sync</source>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="360"/>
+ <source>Ask before syncing folders larger than</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="251"/>
- <source>&Local Folder</source>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
+ <source>Ask before syncing external storages</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="344"/>
- <source>&Keep local data</source>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
+ <source>Keep local data</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ync everything from server</source>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="628"/>
+ <source><html><head/><body><p>If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.</p><p>Do not check this if the local content should be uploaded to the servers folder.</p></body></html></source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/>
- <source>&Username</source>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="631"/>
+ <source>Erase local folder and start a clean sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="83"/>
- <source>&Password</source>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>OwncloudOAuthCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/>
- <source>Please switch to your browser to proceed.</source>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/>
- <source>An error occurred while connecting. Please try again.</source>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="56"/>
- <source>Re-open Browser</source>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="73"/>
+ <source>&Username</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="69"/>
- <source>Copy link</source>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="83"/>
+ <source>&Password</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>OwncloudSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="343"/>
- <source>Register with a provider</source>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="356"/>
+ <source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="365"/>
- <source>Log in</source>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="73"/>
+ <source>Logo</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="194"/>
- <source>Server Address</source>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="183"/>
+ <source>Server address</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>OwncloudWizardResultPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizardresultpage.ui" line="163"/>
- <source>Your entire account is synced to the local folder </source>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="262"/>
+ <source>This is the link to your %1 web interface when you open it in the browser.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject</name>
- <message>
- <location filename="../src/common/utility.cpp" line="463"/>
- <source>in the future</source>
- <translation type="unfinished"></translation>
- </message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>%n day ago</source>
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="459"/>
- <source>%n days ago</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
- </translation>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="469"/>
- <source>%n hour ago</source>
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"></translation>
+ </message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="471"/>
- <source>%n hours ago</source>
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="478"/>
+ <location filename="../src/common/utility.cpp" line="455"/>
<source>now</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="480"/>
- <source>Less than a minute ago</source>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
<translation type="unfinished"></translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="484"/>
- <source>%n minute ago</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
- </translation>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
+ <source>New folder</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="133"/>
+ <source>Failed to create debug archive</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="134"/>
+ <source>Could not create debug archive in selected location!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/usermodel.cpp" line="805"/>
+ <source>You renamed %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/usermodel.cpp" line="807"/>
+ <source>You deleted %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/usermodel.cpp" line="809"/>
+ <source>You created %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/usermodel.cpp" line="811"/>
+ <source>You changed %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/usermodel.cpp" line="835"/>
+ <source>Synced %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/filesystem.cpp" line="322"/>
+ <source>Error deleting the file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
+ <source>Paths beginning with '#' character are not supported in VFS mode.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>ResolveConflictsDialog</name>
+ <message>
+ <location filename="../src/gui/ResolveConflictsDialog.qml" line="40"/>
+ <source>Solve sync conflicts</source>
+ <translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="486"/>
- <source>%n minutes ago</source>
+ <location filename="../src/gui/ResolveConflictsDialog.qml" line="57"/>
+ <source>%1 files in conflict</source>
+ <comment>indicate the number of conflicts to resolve</comment>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="490"/>
- <source>Some time ago</source>
+ <location filename="../src/gui/ResolveConflictsDialog.qml" line="64"/>
+ <source>Choose if you want to keep the local version, server version, or both. If you choose both, the local file will have a number added to its name.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="153"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <location filename="../src/gui/ResolveConflictsDialog.qml" line="80"/>
+ <source>All local versions</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/ResolveConflictsDialog.qml" line="98"/>
+ <source>All server versions</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/ResolveConflictsDialog.qml" line="153"/>
+ <source>Resolve conflicts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/ResolveConflictsDialog.qml" line="157"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>ShareDelegate</name>
+ <message>
+ <location filename="../src/gui/filedetails/ShareDelegate.qml" line="191"/>
+ <source>Copied!</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>ShareDetailsPage</name>
+ <message>
+ <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="99"/>
+ <source>An error occurred setting the share password.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="217"/>
+ <source>Edit share</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="291"/>
+ <source>Share label</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="323"/>
+ <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="369"/>
+ <source>Allow upload and editing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="356"/>
+ <source>View only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="382"/>
+ <source>File drop (upload only)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="402"/>
+ <source>Allow resharing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="441"/>
+ <source>Hide download</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="468"/>
+ <source>Password protection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="578"/>
+ <source>Set expiration date</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="663"/>
+ <source>Note to recipient</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="709"/>
+ <source>Enter a note for the recipient</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="730"/>
+ <source>Unshare</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="738"/>
+ <source>Add another link</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="781"/>
+ <source>Share link copied!</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="781"/>
+ <source>Copy share link</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>ShareView</name>
+ <message>
+ <location filename="../src/gui/filedetails/ShareView.qml" line="93"/>
+ <source>Password required for new share</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/ShareView.qml" line="121"/>
+ <source>Share password</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/ShareView.qml" line="157"/>
+ <source>Shared with you by %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/ShareView.qml" line="163"/>
+ <source>Expires in %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/ShareView.qml" line="313"/>
+ <source>Sharing is disabled</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/ShareView.qml" line="320"/>
+ <source>This item cannot be shared.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/ShareView.qml" line="328"/>
+ <source>Sharing is disabled.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>ShareeSearchField</name>
+ <message>
+ <location filename="../src/gui/filedetails/ShareeSearchField.qml" line="47"/>
+ <source>Search for users or groups?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/filedetails/ShareeSearchField.qml" line="47"/>
+ <source>Sharing is not available for this folder</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>SyncJournalDb</name>
+ <message>
+ <location filename="../src/common/syncjournaldb.cpp" line="981"/>
+ <source>Failed to connect database.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>SyncStatus</name>
+ <message>
+ <location filename="../src/gui/tray/SyncStatus.qml" line="94"/>
+ <source>Sync now</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/SyncStatus.qml" line="113"/>
+ <source>Resolve conflicts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/SyncStatus.qml" line="126"/>
+ <source>Open browser</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>TalkReplyTextField</name>
+ <message>
+ <location filename="../src/gui/tray/TalkReplyTextField.qml" line="16"/>
+ <source>Reply to ?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TalkReplyTextField.qml" line="51"/>
+ <source>Send reply to chat message</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>TermsOfServiceCheckWidget</name>
+ <message>
+ <location filename="../src/gui/wizard/termsofservicecheckwidget.ui" line="26"/>
+ <source>Terms of Service</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/termsofservicecheckwidget.ui" line="47"/>
+ <source>Logo</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/termsofservicecheckwidget.ui" line="76"/>
+ <source>Switch to your browser to accept the terms of service</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>TrayWindowHeader</name>
+ <message>
+ <location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayWindowHeader.qml" line="110"/>
+ <source>More apps</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayWindowHeader.qml" line="133"/>
+ <source>Open %1 in browser</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>UnifiedSearchInputContainer</name>
+ <message>
+ <location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="40"/>
+ <source>Search files, messages, events ?</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>UnifiedSearchPlaceholderView</name>
+ <message>
+ <location filename="../src/gui/tray/UnifiedSearchPlaceholderView.qml" line="39"/>
+ <source>Start typing to search</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>UnifiedSearchResultFetchMoreTrigger</name>
+ <message>
+ <location filename="../src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml" line="45"/>
+ <source>Load more results</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>UnifiedSearchResultItemSkeleton</name>
+ <message>
+ <location filename="../src/gui/tray/UnifiedSearchResultItemSkeleton.qml" line="29"/>
+ <source>Search result skeleton.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>UnifiedSearchResultListItem</name>
+ <message>
+ <location filename="../src/gui/tray/UnifiedSearchResultListItem.qml" line="43"/>
+ <source>Load more results</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>UnifiedSearchResultNothingFound</name>
+ <message>
+ <location filename="../src/gui/tray/UnifiedSearchResultNothingFound.qml" line="40"/>
+ <source>No results for</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>UnifiedSearchResultSectionItem</name>
+ <message>
+ <location filename="../src/gui/tray/UnifiedSearchResultSectionItem.qml" line="33"/>
+ <source>Search results section %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>UserLine</name>
+ <message>
+ <location filename="../src/gui/tray/UserLine.qml" line="31"/>
+ <source>Switch to account</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserLine.qml" line="70"/>
+ <source>Current account status is online</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserLine.qml" line="70"/>
+ <source>Current account status is do not disturb</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserLine.qml" line="135"/>
+ <source>Account actions</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserLine.qml" line="149"/>
+ <source>Set status</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserLine.qml" line="156"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="165"/>
+ <source>Log out</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserLine.qml" line="156"/>
+ <location filename="../src/gui/tray/UserLine.qml" line="165"/>
+ <source>Log in</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/UserLine.qml" line="179"/>
+ <source>Remove account</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>UserStatusSelector</name>
+ <message>
+ <location filename="../src/gui/UserStatusSelector.qml" line="41"/>
+ <source>Online status</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/UserStatusSelector.qml" line="61"/>
+ <source>Online</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/UserStatusSelector.qml" line="72"/>
+ <source>Away</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/UserStatusSelector.qml" line="84"/>
+ <source>Do not disturb</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/UserStatusSelector.qml" line="85"/>
+ <source>Mute all notifications</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/UserStatusSelector.qml" line="100"/>
+ <source>Invisible</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/UserStatusSelector.qml" line="101"/>
+ <source>Appear offline</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/UserStatusSelector.qml" line="125"/>
+ <source>Status message</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/UserStatusSelector.qml" line="194"/>
+ <source>What is your status?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/UserStatusSelector.qml" line="238"/>
+ <source>Clear status message after</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/UserStatusSelector.qml" line="271"/>
+ <source>Cancel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/UserStatusSelector.qml" line="278"/>
+ <source>Clear</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/UserStatusSelector.qml" line="283"/>
+ <source>Apply</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="130"/>
+ <location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="134"/>
+ <location filename="../src/common/utility.cpp" line="124"/>
<source>%L1 MB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="138"/>
+ <location filename="../src/common/utility.cpp" line="128"/>
<source>%L1 KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="141"/>
+ <location filename="../src/common/utility.cpp" line="109"/>
<source>%L1 B</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"></translation>
+ </message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -3815,7 +6638,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="300"/>
<source>%n month(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -3823,7 +6646,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="301"/>
<source>%n day(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -3831,7 +6654,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="302"/>
<source>%n hour(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -3839,7 +6662,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="303"/>
<source>%n minute(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -3847,7 +6670,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="315"/>
+ <location filename="../src/common/utility.cpp" line="304"/>
<source>%n second(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -3855,7 +6678,7 @@
</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="339"/>
+ <location filename="../src/common/utility.cpp" line="328"/>
<source>%1 %2</source>
<translation type="unfinished"></translation>
</message>
@@ -3863,38 +6686,38 @@
<context>
<name>ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="233"/>
+ <location filename="../src/common/checksums.cpp" line="262"/>
<source>The checksum header is malformed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="248"/>
- <source>The checksum header contained an unknown checksum type '%1'</source>
+ <location filename="../src/common/checksums.cpp" line="296"/>
+ <source>The checksum header contained an unknown checksum type "%1"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="252"/>
- <source>The downloaded file does not match the checksum, it will be resumed.</source>
+ <location filename="../src/common/checksums.cpp" line="301"/>
+ <source>The downloaded file does not match the checksum, it will be resumed. "%1" != "%2"</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>main.cpp</name>
<message>
- <location filename="../src/gui/main.cpp" line="39"/>
+ <location filename="../src/gui/main.cpp" line="50"/>
<source>System Tray not available</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/main.cpp" line="40"/>
- <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as 'trayer' and try again.</source>
+ <location filename="../src/gui/main.cpp" line="51"/>
+ <source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as "trayer" and try again.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>nextcloudTheme::about()</name>
+ <name>nextcloudTheme::aboutInfo()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="329"/>
+ <location filename="../src/libsync/theme.cpp" line="592"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"></translation>
</message>
@@ -3902,142 +6725,172 @@
<context>
<name>progress</name>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="32"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="33"/>
+ <source>Virtual file created</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="35"/>
+ <source>Replaced by virtual file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="34"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="40"/>
<source>Uploaded</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="43"/>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="39"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
+ <source>Server version downloaded, copied changed local file into case conflict conflict file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="47"/>
<source>Deleted</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="42"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
<source>Moved to %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="44"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="52"/>
<source>Ignored</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="46"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
<source>Filesystem access error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="48"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="91"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="58"/>
<source>Updated local metadata</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="55"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="60"/>
+ <source>Updated local virtual files metadata</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="62"/>
+ <source>Updated end-to-end encryption metadata</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>Unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="66"/>
- <source>downloading</source>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="79"/>
+ <source>Downloading</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="81"/>
+ <source>Uploading</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="68"/>
- <source>uploading</source>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="83"/>
+ <source>Deleting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="70"/>
- <source>deleting</source>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="86"/>
+ <source>Moving</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="73"/>
- <source>moving</source>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="88"/>
+ <source>Ignoring</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="75"/>
- <source>ignoring</source>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="93"/>
+ <source>Updating local metadata</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="77"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="79"/>
- <source>error</source>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="95"/>
+ <source>Updating local virtual files metadata</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="81"/>
- <source>updating local metadata</source>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="97"/>
+ <source>Updating end-to-end encryption metadata</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="62"/>
- <source>Status undefined</source>
+ <location filename="../src/libsync/theme.cpp" line="102"/>
+ <source>Sync status is unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="65"/>
- <source>Waiting to start sync</source>
+ <location filename="../src/libsync/theme.cpp" line="105"/>
+ <source>Waiting to start syncing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="68"/>
+ <location filename="../src/libsync/theme.cpp" line="108"/>
<source>Sync is running</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="71"/>
- <source>Sync Success</source>
+ <location filename="../src/libsync/theme.cpp" line="111"/>
+ <source>Sync was successful</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="74"/>
- <source>Sync Success, some files were ignored.</source>
+ <location filename="../src/libsync/theme.cpp" line="114"/>
+ <source>Sync was successful but some files were ignored</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="77"/>
- <source>Sync Error</source>
+ <location filename="../src/libsync/theme.cpp" line="117"/>
+ <source>Error occurred during sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="80"/>
- <source>Setup Error</source>
+ <location filename="../src/libsync/theme.cpp" line="120"/>
+ <source>Error occurred during setup</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="83"/>
- <source>Preparing to sync</source>
+ <location filename="../src/libsync/theme.cpp" line="126"/>
+ <source>Stopping sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="86"/>
- <source>Aborting ?</source>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="89"/>
+ <location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation type="unfinished"></translation>
</message>
@@ -4045,24 +6898,54 @@
<context>
<name>utility</name>
<message>
- <location filename="../src/gui/guiutility.cpp" line="34"/>
+ <location filename="../src/gui/guiutility.cpp" line="45"/>
<source>Could not open browser</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/guiutility.cpp" line="35"/>
+ <location filename="../src/gui/guiutility.cpp" line="46"/>
<source>There was an error when launching the browser to go to URL %1. Maybe no default browser is configured?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/guiutility.cpp" line="58"/>
+ <location filename="../src/gui/guiutility.cpp" line="69"/>
<source>Could not open email client</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/guiutility.cpp" line="59"/>
+ <location filename="../src/gui/guiutility.cpp" line="70"/>
<source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/gui/guiutility.cpp" line="85"/>
+ <source>Always available locally</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/guiutility.cpp" line="87"/>
+ <source>Currently available locally</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/guiutility.cpp" line="89"/>
+ <source>Some available online only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/guiutility.cpp" line="92"/>
+ <source>Available online only</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/guiutility.cpp" line="99"/>
+ <source>Make always available locally</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/guiutility.cpp" line="104"/>
+ <source>Free up local space</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
diff -Nru nextcloud-desktop-3.16.4/translations/client_eo.ts nextcloud-desktop-3.16.6/translations/client_eo.ts
--- nextcloud-desktop-3.16.4/translations/client_eo.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_eo.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
@@ -570,7 +562,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Malmarkitaj dosierujoj estos <b>forigitaj</b> el via loka dosiersistemo kaj ne plu estos sinkronigitaj ?e tiu ?i komputilo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Nuligi</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Validigi</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Konektita kun servilo <server> kiel uzanto <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>?ion sinkronigi</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Validigi</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Nuligi</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Konektita kun servilo <server> kiel uzanto <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Neniu konto agordita.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation type="unfinished"/>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Neniu konto agordita.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation type="unfinished"/>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -730,12 +738,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Malfermi dosierujon</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>?ifri</translation>
@@ -774,16 +776,6 @@
<translation>Rekomenci sinkronigon</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Da?rigi sinkronigon</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Pa?zigi sinkronigon</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Ne plu sinkronigi tiun dosierujon</translation>
@@ -809,21 +801,11 @@
<translation>Kreo de dosierujo malsukcesis</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Konfirmu la forigadon de la sinkronigo de tiu dosierujo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>?u vi vere volas ?esi sinkronigi la dosierujon <i>%1</i>?</p><p><b>Notu:</b> Tio <b>ne</b> forigos la dosierojn.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Ne plu sinkronigi tiun dosierujon</translation>
@@ -853,23 +835,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -883,36 +865,46 @@
<translation>Sinkronigo estas ruli?anta.<br/>?u vi volas fini ?in?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) el %2 uzataj. Certaj dosierujoj, inkluzive de rete muntitaj a? kunhavigitaj dosierujoj, eble havas aliajn limigojn.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 uzata(j)</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 el %2 uzitaj</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>?i-momente estas neniu informo pri konservejospaco.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 uzata(j)</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 kiel %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Tiu konto subtenas tutvojan ?ifradon</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
<source>Connected to %1.</source>
<translation>Konektita al %1.</translation>
@@ -928,80 +920,126 @@
<translation>La servilo %1 estas en re?imo de prizorgado</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Elsalutita de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Konektante al %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Kelkaj dosierujoj ne sinkroni?is, ?ar ili estas tro grandaj:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Kelkaj dosierujoj ne sinkroni?is, ?ar ili estas konservataj en ekstera konservejo:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Kelkaj dosierujoj ne sinkroni?is, ?ar ili estas tro grandaj ?? konservataj en ekstera konservejo:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Malfermi dosierujon</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Da?rigi sinkronigon</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Pa?zigi sinkronigon</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>?u vi vere volas ?esi sinkronigi la dosierujon <i>%1</i>?</p><p><b>Notu:</b> Tio <b>ne</b> forigos la dosierojn.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Neniu konekto al %1 agordita.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Kelkaj dosierujoj ne sinkroni?is, ?ar ili estas tro grandaj:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) el %2 uzataj. Certaj dosierujoj, inkluzive de rete muntitaj a? kunhavigitaj dosierujoj, eble havas aliajn limigojn.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Kelkaj dosierujoj ne sinkroni?is, ?ar ili estas konservataj en ekstera konservejo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 el %2 uzitaj</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Kelkaj dosierujoj ne sinkroni?is, ?ar ili estas tro grandaj ?? konservataj en ekstera konservejo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>?i-momente estas neniu informo pri konservejospaco.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 kiel %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Tiu konto subtenas tutvojan ?ifradon</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Konektante al %1?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Neniu konekto al %1 agordita.</translation>
+ </message>
</context>
<context>
<name>OCC::AccountSetupFromCommandLineJob</name>
@@ -1115,11 +1153,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Foliumi?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Atestila pasvorto:</translation>
@@ -1130,6 +1163,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Foliumi?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Elekti atestilon</translation>
@@ -1180,46 +1218,46 @@
<translation>Da?rigi</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Eraro dum aliro al la dosiero de agordoj</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation type="unfinished"/>
</message>
@@ -1261,6 +1299,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1268,6 +1345,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
@@ -1472,7 +1554,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Eraro dum konservado de pridatumoj en la datumbazo</translation>
</message>
@@ -1602,21 +1684,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1630,28 +1697,28 @@
%1</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>A?tentiga eraro: a? la uzantnomo a? la pasvorto mal?ustas.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="183"/>
- <source>Timeout</source>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>La akreditiloj provizitaj ne ?ustas</translation>
+ <location filename="../src/gui/connectionvalidator.cpp" line="183"/>
+ <source>Timeout</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
@@ -1663,16 +1730,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Bv. ?isdatigi la servilon, kaj remalfermi la klienton.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>A?tentiga eraro: a? la uzantnomo a? la pasvorto mal?ustas.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>La akreditiloj provizitaj ne ?ustas</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation type="unfinished"/>
</message>
@@ -1680,19 +1762,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1700,27 +1782,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Dosierujo ne trovi?is: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1959,11 +2041,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
@@ -1975,28 +2052,33 @@
<translation>Eraro ricevita el la servilo: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Ne eblis analizi la JSON-datumojn ricevitajn el la servilo: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>La respondo el la servilo ne enhavis ?iujn atenditajn kampojn</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Ne eblis analizi la JSON-datumojn ricevitajn el la servilo: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2039,6 +2121,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 estis forigita.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 estis ?isdatigita.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 estis alinomita al %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 estis movita al %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2054,17 +2164,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 estis forigita.</numerusform><numerusform>%1 kaj %n plia(j) dosiero(j) estis forigitaj.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 estis forigita.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -2080,33 +2179,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 ?isdati?is.</numerusform><numerusform>%1 kaj %n plia(j) dosiero(j) ?isdati?is.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 estis ?isdatigita.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 estis alinomita al %2.</numerusform><numerusform>%1 estis alinomita al %2, kaj %n plia(j) dosiero(j) estis alinomitaj.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 estis alinomita al %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 estis movita al %2.</numerusform><numerusform>%1 estis movita al %2, kaj %n plia(j) dosiero(j) estis movitaj.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 estis movita al %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2143,67 +2225,67 @@
<translation>Sinkronigaj aktiva?oj</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Ne eblis legi la sisteman dosieron pri esceptoj</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Nova dosierujo pli granda ol %1 MB estis aldonita: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Dosierujo el ekstera konservejo estis aldonita.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Bv. iri al la agordoj por elekti, ?u vi volas el?uti ?in.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>La dosierujo %1 estis kreita sed estis eksigita el sinkronigo anta?e. Datumoj ene de ?i ne estos sinkronigitaj.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>La dosiero %1 estis kreita sed estis eksigita el sinkronigo anta?e. ?i ne estos sinkronigita.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2216,41 +2298,41 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2291,11 +2373,6 @@
<translation>Ne eblis restarigi la staton de la dosierujo</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(savkopio)</translation>
@@ -2306,6 +2383,11 @@
<translation>(savkopio %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Nedifinita stato.</translation>
@@ -2376,16 +2458,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Sinkronigo estas pa?zigita.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (Sinkronigo estas pa?zigita)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2432,6 +2504,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Sinkronigo estas pa?zigita.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (Sinkronigo estas pa?zigita)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2475,16 +2557,6 @@
<translation>Eraro dum ?argado de la listo de dosierujoj el la servilo.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Estas nesolvitaj konfliktoj. Alklaku por detaloj.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation type="unfinished"/>
@@ -2526,15 +2598,30 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Estas nesolvitaj konfliktoj. Alklaku por detaloj.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2582,21 +2669,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 el %2, dosiero %3 el %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2756,11 +2838,6 @@
<translation>?efaj agordoj</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Lan?i, kiam la seanco ekas</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation type="unfinished"/>
@@ -2771,11 +2848,6 @@
<translation>Por la taskopleto</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>&Uzi unukolorajn piktogramojn</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2791,17 +2863,32 @@
<translation>Detalaj agordoj</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Demandi anta? ol sinkronigi dosierujon el ekstera konservejo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Lan?i, kiam la seanco ekas</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>&Uzi unukolorajn piktogramojn</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2812,11 +2899,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Demandi anta? ol sinkronigi dosierujon el ekstera konservejo</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2868,11 +2950,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Restarti kaj ?isdatigi</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation type="unfinished"/>
@@ -2893,6 +2970,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Restarti kaj ?isdatigi</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Servilaj sciigoj, kiu bezonas atenton.</translation>
@@ -2913,6 +3000,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>stabila</translation>
@@ -2987,6 +3079,11 @@
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3151,102 +3248,97 @@
<translation>Nova dosiernomo</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>?an?i nomon de dosiero</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation type="unfinished"/>
</message>
@@ -3367,16 +3459,6 @@
<translation><p>Nova versio de la kliento %1 disponeblas.</p><p><b>%2</b> el?uteblas. La instalita versio estas %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Preterpasi momente</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>?isdatigi</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>?isdatigo malsukcesis</translation>
@@ -3401,6 +3483,16 @@
<source>Update manually</source>
<translation>?isdatigi permane</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Preterpasi momente</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>?isdatigi</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3425,6 +3517,23 @@
<translation>Tiu prokurilo postulas a?tentigon</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>El?uta retkapacito</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Limigi al</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>Kbajtoj/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation type="unfinished"/>
@@ -3447,46 +3556,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>El?uta retkapacito</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Senlima</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>Kbajtoj/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Limigi al</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Limigi al 3/4 de la taksita retkapacito</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Al?uta retkapacito</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>A?tomate limigi</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Al?uta retkapacito</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Gastigonomo de la prokurila servilo</translation>
@@ -3515,6 +3607,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>Ne eblis kontroli, ?u estas novaj ?isdatigoj.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation type="unfinished"/>
@@ -3545,11 +3647,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>Ne eblis kontroli, ?u estas novaj ?isdatigoj.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation type="unfinished"/>
@@ -3560,14 +3657,19 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation>Stato pri ?isdatigoj estas nekonata: ne eblis kontroli, ?u estas novaj ?isdatigoj.</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
- <source>Update status is unknown: Did not check for new updates.</source>
- <translation>Stato pri ?isdatigoj estas nekonata: ne eblis kontroli, ?u estas novaj ?isdatigoj.</translation>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
@@ -3745,11 +3847,6 @@
<translation><font color="green">Sukcese konektita al %1: %2 je versio %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>Nevalida retadreso</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Malsukcesis konekti al %1 ?e %2:<br/>%3</translation>
@@ -3760,6 +3857,16 @@
<translation>Eltempi?o dum konekto al %1 ?e %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Aliro nepermesata de la servilo. Por kontroli, ?u vi rajtas pri aliro, <a href="%1">alklaku ?i tie</a> por iri al la servo pere de via retumilo.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>Nevalida retadreso</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation type="unfinished"/>
@@ -3770,11 +3877,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Aliro nepermesata de la servilo. Por kontroli, ?u vi rajtas pri aliro, <a href="%1">alklaku ?i tie</a> por iri al la servo pere de via retumilo.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation type="unfinished"/>
@@ -3980,68 +4082,58 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
+ <source>File names containing the character "%1" are not supported on this file system.</source>
+ <comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
- <source>File names containing the character "%1" are not supported on this file system.</source>
- <comment>%1: the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
+ <source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
+ <source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>Folder name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
+ <source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
+ <source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
- <source>File name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="433"/>
+ <source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
- <source>Folder name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
- <source>File name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="433"/>
- <source>Filename contains trailing spaces.</source>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
@@ -4053,6 +4145,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
@@ -4143,64 +4245,74 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation type="unfinished"/>
</message>
@@ -4208,38 +4320,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4257,12 +4369,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>Dosiero ?an?i?is ekde sia malkovro</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4319,6 +4425,12 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>Dosiero ?an?i?is ekde sia malkovro</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4336,39 +4448,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>ne eblis forigi dosieron %1, eraro: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4381,14 +4493,14 @@
<translation>Ne eblis forigi %1 pro konflikto kun loka dosiernomo</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4396,49 +4508,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Ne eblis ?an?i nomon de dosiero</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4495,39 +4607,39 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Ne?usta HTTP-kodo ricevita de servilo. Atendita: 201, ricevita: ?%1 %2?.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Eraro dum konservado de pridatumoj en la datumbazo</translation>
</message>
@@ -4535,22 +4647,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>Dosiero %1 ne el?uteblis, ?ar alia samnoma dosiero, kiu malsamas nur usklece, ekzistas.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>Al?uto de %1 transpasas la dosierujan kvoton</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4558,11 +4659,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Forigita dosiero (ekal?uti) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Loka dosiero ?an?i?is dum sinkronigo. ?i rekomenci?os.</translation>
@@ -4592,6 +4688,22 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>Al?uto de %1 transpasas la dosierujan kvoton</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Forigita dosiero (ekal?uti) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4840,6 +4952,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Menuo pri kunhavigo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Mi kunhavigis ion kun vi</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Opcioj pri kunhavigo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Kopii privatan ligilon al tondujo</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4872,43 +5010,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Menuo pri kunhavigo</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Mi kunhavigis ion kun vi</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Opcioj pri kunhavigo</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Aktiveco</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Kopii privatan ligilon al tondujo</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4924,11 +5036,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Kopii internan ligilon</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -4955,12 +5062,6 @@
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Malfermi per retumilo</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Solvi konflikton?</translation>
@@ -4990,6 +5091,17 @@
<source>Delete</source>
<translation>Forigi</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Kopii internan ligilon</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Malfermi per retumilo</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5090,13 +5202,6 @@
<translation>Tiu ?i konekto estas ?ifrita uzante %1 bitoj %2.</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Tiu ?i konekto NE estas sekura, ?ar ?i estas ne ?ifrita.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Servil-versio: %1</translation>
@@ -5116,6 +5221,13 @@
<source>The connection is not secure</source>
<translation>La konekto ne sekuras</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Tiu ?i konekto NE estas sekura, ?ar ?i estas ne ?ifrita.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5208,6 +5320,32 @@
<translation>%1 (preterpasita pro anta?a eraro, reprovo je %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Nur disponeblas %1, bezono de almena? %2 por eki</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>Ne eblas malfermi a? krei lokan sinkronigan datumbazon. Certigu, ke vi rajtas aliri al la sinkroniga dosierujo.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Diskospaco ne sufi?as: el?utoj, kiuj reduktos liberan spacon sub %1, ne okazis.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>La servilo ne plu havas sufi?an spacon por iuj al?utoj.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Nesolvita konflikto.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation type="unfinished"/>
@@ -5228,22 +5366,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Nesolvita konflikto.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Nur disponeblas %1, bezono de almena? %2 por eki</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>Ne eblas malfermi a? krei lokan sinkronigan datumbazon. Certigu, ke vi rajtas aliri al la sinkroniga dosierujo.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
@@ -5263,16 +5385,6 @@
<source>Cannot open the sync journal</source>
<translation>Ne eblas malfermi la sinkronigan protokolon</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Diskospaco ne sufi?as: el?utoj, kiuj reduktos liberan spacon sub %1, ne okazis.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>La servilo ne plu havas sufi?an spacon por iuj al?utoj.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5283,7 +5395,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5667,11 +5779,6 @@
<source>Less than a minute</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5679,20 +5786,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5707,6 +5804,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5849,6 +5961,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Bv. ensaluti</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>Neniu sinkroniga dosiero agordita.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Malkonektita el %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Nesubtenata versio de servilo</translation>
@@ -5869,31 +5996,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Malkonektita el %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Malkonektita el la jenaj kontoj:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Konto %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Bv. ensaluti</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Konta sinkronigo estas malebligita</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5915,11 +6017,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>Neniu sinkroniga dosiero agordita.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation type="unfinished"/>
@@ -5930,6 +6027,21 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Malkonektita el la jenaj kontoj:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Konto %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Konta sinkronigo estas malebligita</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5938,11 +6050,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Loka dosierujo</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Salutnomo</translation>
@@ -5978,22 +6085,11 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Elekti tion, kion sinkronigi</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation type="unfinished"/>
@@ -6008,6 +6104,22 @@
<source>Erase local folder and start a clean sync</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Elekti tion, kion sinkronigi</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Loka dosierujo</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6048,6 +6160,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>en la estonteco</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>nun</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Anta? nelonge</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6088,57 +6245,12 @@
<source>Synced %1</source>
<translation>Sinkronigis %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>en la estonteco</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>nun</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Anta? nelonge</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6384,6 +6496,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6573,16 +6728,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6597,6 +6742,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6830,16 +6985,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Pretigado de sinkronigo</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Pretigado de sinkronigo</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Sinkronigo estas pa?zigita</translation>
@@ -6898,4 +7053,17 @@
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_es_CL.ts nextcloud-desktop-3.16.6/translations/client_es_CL.ts
--- nextcloud-desktop-3.16.4/translations/client_es_CL.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_es_CL.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
@@ -570,7 +562,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Las carpetas no marcadas ser?n <b>eliminadas</b> de tu sistema de archivos local y ya no ser?n sincronizados a esta computadora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Cancelar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Aplicar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Conectado con <server> como <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Sincronizar todo</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Aplicar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Cancelar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Conectado con <server> como <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>No hay cuentas configuradas.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation type="unfinished"/>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>No hay cuentas configuradas.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation type="unfinished"/>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -730,12 +738,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Abrir carpeta</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -774,16 +776,6 @@
<translation>Reiniciar sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Reanudar sincronizaci?n</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Pausar sincronizaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Eliminar la conexi?n de sincronizaci?n de carpetas</translation>
@@ -809,21 +801,11 @@
<translation>Fall? la creaci?n de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar la Eliminaci?n de la Conexi?n de Sincronizaci?n de Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>?Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrar? ning?n archivo.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar la Conexi?n de Sincronizaci?n de la Carpeta</translation>
@@ -853,23 +835,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -883,33 +865,43 @@
<translation>La operaci?n de sincronizaci?n est? en curso. <br/>?Deseas terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes l?mites</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 de %2 en uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Actualmente no hay informaci?n disponible del espacio usado.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 en uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
@@ -928,80 +920,126 @@
<translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Cerraste sesi?n en %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Abrir carpeta</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Reanudar sincronizaci?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Pausar sincronizaci?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>?Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrar? ning?n archivo.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>No hay %1 conexi?n configurada. </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes l?mites</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Actualmente no hay informaci?n disponible del espacio usado.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>No hay %1 conexi?n configurada. </translation>
+ </message>
</context>
<context>
<name>OCC::AccountSetupFromCommandLineJob</name>
@@ -1115,11 +1153,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation type="unfinished"/>
@@ -1130,6 +1163,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Seleccionar un certificado</translation>
@@ -1180,46 +1218,46 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Error al acceder el archivo de configuraci?n</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation type="unfinished"/>
</message>
@@ -1261,6 +1299,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1268,6 +1345,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
@@ -1472,7 +1554,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir metadatos a la base de datos</translation>
</message>
@@ -1602,21 +1684,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1630,28 +1697,28 @@
%1</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Error de autenticaci?n: El usuario o contrase?a est?n equivocados. </translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="183"/>
- <source>Timeout</source>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Las credenciales proporcionadas no son correctas</translation>
+ <location filename="../src/gui/connectionvalidator.cpp" line="183"/>
+ <source>Timeout</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
@@ -1663,16 +1730,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor actualiza a la versi?n m?s reciente del servidor y reinicia el cliente.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Error de autenticaci?n: El usuario o contrase?a est?n equivocados. </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Las credenciales proporcionadas no son correctas</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation type="unfinished"/>
</message>
@@ -1680,19 +1762,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1700,27 +1782,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1959,11 +2041,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
@@ -1975,15 +2052,14 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
- <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
+ <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
<message>
@@ -1993,10 +2069,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2039,6 +2121,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ha sido eliminado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ha sido actualizado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 ha sido renombrado a %2. </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 se ha movido a %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2054,17 +2164,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ha sido eliminado.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -2080,33 +2179,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ha sido actualizado.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 ha sido renombrado a %2. </translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 se ha movido a %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2143,67 +2225,67 @@
<translation>Sincronizar Actividad</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>No fue posible leer el archivo de exclusi?n del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una nueva carpeta de m?s de %1 MB ha sido agregada: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una carpeta de un almacenamiento externo ha sido agregada.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2212,41 +2294,41 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2287,11 +2369,6 @@
<translation>No fue posible restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(respaldo)</translation>
@@ -2302,6 +2379,11 @@
<translation>(respaldo %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation type="unfinished"/>
@@ -2372,16 +2454,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>La sincronizaci?n est? pausada.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (La sincronizaci?n est? pausada)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2428,6 +2500,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>La sincronizaci?n est? pausada.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (La sincronizaci?n est? pausada)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2471,16 +2553,6 @@
<translation>Se present? un error al cargar la lista de carpetas desde el servidor. </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Hay conflictos sin resolver. Haz click para m?s detalles. </translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation type="unfinished"/>
@@ -2522,15 +2594,30 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Hay conflictos sin resolver. Haz click para m?s detalles. </translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2578,21 +2665,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 de %2, archivo %3 de %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2752,11 +2834,6 @@
<translation>Configuraciones generales</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Lanzar al Iniciar el Sistema</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation type="unfinished"/>
@@ -2767,11 +2844,6 @@
<translation>Para la Bandeja del Sistema</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Usar ?conos &Monocrom?ticos</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2787,17 +2859,32 @@
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Perdir confirmaci?p?n antes de sincronizar almacenamientos externos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Lanzar al Iniciar el Sistema</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Usar ?conos &Monocrom?ticos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2808,11 +2895,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Perdir confirmaci?p?n antes de sincronizar almacenamientos externos</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2864,11 +2946,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Reinicia && Actualiza</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation type="unfinished"/>
@@ -2889,6 +2966,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Reinicia && Actualiza</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
@@ -2909,6 +2996,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation type="unfinished"/>
@@ -2983,6 +3075,11 @@
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3143,102 +3240,97 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation type="unfinished"/>
</message>
@@ -3359,16 +3451,6 @@
<translation><p>Una nueva versi?n del Cliente %1 est? disponible.</p><p><b>%2</b> est? disponible para descargar. La versi?n instalada es la %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Omitir esta vez</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Obtener la actualizaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation type="unfinished"/>
@@ -3393,6 +3475,16 @@
<source>Update manually</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Omitir esta vez</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Obtener la actualizaci?n</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3417,6 +3509,23 @@
<translation>El servidor Proxy requiere de autenticaci?n</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Ancho de banda para Descarga</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Limitar a</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation type="unfinished"/>
@@ -3439,46 +3548,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Ancho de banda para Descarga</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Sin l?mite</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Limitar a</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Limitar a 3/4 del ancho de banda estimado</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Ancho de banda para Carga</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Limitar autom?ticamente</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Ancho de banda para Carga</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Nombre del servidor proxy</translation>
@@ -3507,6 +3599,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>No fue posible verificar nuevas actualizaciones.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation type="unfinished"/>
@@ -3537,11 +3639,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>No fue posible verificar nuevas actualizaciones.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation type="unfinished"/>
@@ -3552,14 +3649,19 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation>Estado de la actualizaci?n desconocido. No se verific? si hab?a nuevas actualizaciones. </translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
- <source>Update status is unknown: Did not check for new updates.</source>
- <translation>Estado de la actualizaci?n desconocido. No se verific? si hab?a nuevas actualizaciones. </translation>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
@@ -3737,11 +3839,6 @@
<translation><font color="green">Conectado exitosamente a %1: %2 versi?n %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>URL Inv?lido</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Hubo una falla al conectarse a %1 en %2: <br/>%3</translation>
@@ -3752,6 +3849,16 @@
<translation>Expir? el tiempo al tratar de conectarse a %1 en %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Acceso prohibido por el servidor. Para verificar que tengas el acceso correcto, <a href="%1">haz click aqu?</a> para acceder al servicio con tu navegador.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>URL Inv?lido</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation type="unfinished"/>
@@ -3762,11 +3869,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Acceso prohibido por el servidor. Para verificar que tengas el acceso correcto, <a href="%1">haz click aqu?</a> para acceder al servicio con tu navegador.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation type="unfinished"/>
@@ -3972,68 +4074,58 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
+ <source>File names containing the character "%1" are not supported on this file system.</source>
+ <comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
- <source>File names containing the character "%1" are not supported on this file system.</source>
- <comment>%1: the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
+ <source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
+ <source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>Folder name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
+ <source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
+ <source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
- <source>File name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="433"/>
+ <source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
- <source>Folder name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
- <source>File name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="433"/>
- <source>Filename contains trailing spaces.</source>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
@@ -4045,6 +4137,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
@@ -4135,64 +4237,74 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation type="unfinished"/>
</message>
@@ -4200,38 +4312,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4249,12 +4361,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>El archivo ha cambiado desde que fue descubierto</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4311,6 +4417,12 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>El archivo ha cambiado desde que fue descubierto</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4328,39 +4440,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>no fue posible borrar el archivo %1, error: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4373,14 +4485,14 @@
<translation>No fue posible eliminar %1 porque hay un conflicto con el nombre de archivo local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4388,49 +4500,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4487,39 +4599,39 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>C?digo equivocado de HTTP regresado por el servidor. Se esperaba 201, pero se recibi? "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
@@ -4527,22 +4639,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>El archivo %1 no puede ser cargado porque existe otro archivo con el mismo nombre, con diferencias en su uso de may?sculas / min?sculas</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>La carga de %1 excede la cuota de la carpeta</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4550,11 +4651,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>El archivo local cambi? durante la sincronizaci?n. Se resumir?. </translation>
@@ -4584,6 +4680,22 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>La carga de %1 excede la cuota de la carpeta</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4832,6 +4944,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Te compart? algo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Copiar la liga privada al portapapeles</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4864,43 +5002,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Te compart? algo</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Copiar la liga privada al portapapeles</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4916,11 +5028,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -4947,12 +5054,6 @@
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation type="unfinished"/>
@@ -4982,6 +5083,17 @@
<source>Delete</source>
<translation>Borrar</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5083,13 +5195,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Esta conexi?n NO es segura ya que no est? encriptado.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation type="unfinished"/>
@@ -5109,6 +5214,13 @@
<source>The connection is not secure</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Esta conexi?n NO es segura ya que no est? encriptado.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5201,6 +5313,32 @@
<translation>%1 (omitido por un error previo, intentando de nuevo en %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Solo tiene %1 disponible, se necesita de al menos %2 para iniciar</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>No fue posible abrir o crear la base de datos de sincronizaci?n local. Aseg?rate de que tengas permisos de escritura en la carpeta de sincronizaci?n.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Espacio en disco bajo: Las descargas que podr?an reducir el espacio por debajo de %1 se omitieron.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>No hay espacio disponible en el servidor para algunas cargas.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Conflicto no resuelto.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation type="unfinished"/>
@@ -5221,22 +5359,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Conflicto no resuelto.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Solo tiene %1 disponible, se necesita de al menos %2 para iniciar</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>No fue posible abrir o crear la base de datos de sincronizaci?n local. Aseg?rate de que tengas permisos de escritura en la carpeta de sincronizaci?n.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
@@ -5256,16 +5378,6 @@
<source>Cannot open the sync journal</source>
<translation>No se puede abrir el diario de sincronizaci?n</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Espacio en disco bajo: Las descargas que podr?an reducir el espacio por debajo de %1 se omitieron.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>No hay espacio disponible en el servidor para algunas cargas.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5276,7 +5388,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5660,11 +5772,6 @@
<source>Less than a minute</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5672,20 +5779,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5700,6 +5797,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5842,6 +5954,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Por favor inicia sesi?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>No se han configurado carpetas para sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Desconectado de %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Versi?n del Servidor No Soportada</translation>
@@ -5862,31 +5989,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Desconectado de %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Desconectado de las cunetas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Cuenta %1 : %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Por favor inicia sesi?n</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>La sincronizaci?n de cuentas est? deshabilitada</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5908,11 +6010,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>No se han configurado carpetas para sincronizar</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation type="unfinished"/>
@@ -5923,6 +6020,21 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Desconectado de las cunetas:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Cuenta %1 : %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>La sincronizaci?n de cuentas est? deshabilitada</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5931,11 +6043,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>Carpeta &Local</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation type="unfinished"/>
@@ -5971,22 +6078,11 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Elige qu? sincronizar</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation type="unfinished"/>
@@ -6001,6 +6097,22 @@
<source>Erase local folder and start a clean sync</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Elige qu? sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>Carpeta &Local</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6041,6 +6153,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>en el futuro</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>ahora</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Hace alg?n tiempo</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6081,57 +6238,12 @@
<source>Synced %1</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>en el futuro</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>ahora</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Hace alg?n tiempo</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6377,6 +6489,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6566,16 +6721,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6590,6 +6735,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6823,16 +6978,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Preparando para sincronizar</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Preparando para sincronizar</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>La sincronizaci?n est? pausada</translation>
@@ -6891,4 +7046,17 @@
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_es_CO.ts nextcloud-desktop-3.16.6/translations/client_es_CO.ts
--- nextcloud-desktop-3.16.4/translations/client_es_CO.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_es_CO.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
@@ -570,7 +562,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Las carpetas no marcadas ser?n <b>eliminadas</b> de tu sistema de archivos local y ya no ser?n sincronizados a esta computadora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Cancelar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Aplicar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Conectado con <server> como <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Sincronizar todo</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Aplicar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Cancelar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Conectado con <server> como <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>No hay cuentas configuradas.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation type="unfinished"/>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>No hay cuentas configuradas.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation type="unfinished"/>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -730,12 +738,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Abrir carpeta</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -774,16 +776,6 @@
<translation>Reiniciar sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Reanudar sincronizaci?n</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Pausar sincronizaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Eliminar la conexi?n de sincronizaci?n de carpetas</translation>
@@ -809,21 +801,11 @@
<translation>Fall? la creaci?n de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar la Eliminaci?n de la Conexi?n de Sincronizaci?n de Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>?Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrar? ning?n archivo.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar la Conexi?n de Sincronizaci?n de la Carpeta</translation>
@@ -853,23 +835,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -883,33 +865,43 @@
<translation>La operaci?n de sincronizaci?n est? en curso. <br/>?Deseas terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes l?mites</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 de %2 en uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Actualmente no hay informaci?n disponible del espacio usado.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 en uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
@@ -928,80 +920,126 @@
<translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Cerraste sesi?n en %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Abrir carpeta</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Reanudar sincronizaci?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Pausar sincronizaci?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>?Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrar? ning?n archivo.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>No hay %1 conexi?n configurada. </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes l?mites</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Actualmente no hay informaci?n disponible del espacio usado.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>No hay %1 conexi?n configurada. </translation>
+ </message>
</context>
<context>
<name>OCC::AccountSetupFromCommandLineJob</name>
@@ -1115,11 +1153,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation type="unfinished"/>
@@ -1130,6 +1163,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Seleccionar un certificado</translation>
@@ -1180,46 +1218,46 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Error al acceder el archivo de configuraci?n</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation type="unfinished"/>
</message>
@@ -1261,6 +1299,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1268,6 +1345,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
@@ -1472,7 +1554,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir metadatos a la base de datos</translation>
</message>
@@ -1602,21 +1684,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1630,28 +1697,28 @@
%1</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Error de autenticaci?n: El usuario o contrase?a est?n equivocados. </translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="183"/>
- <source>Timeout</source>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Las credenciales proporcionadas no son correctas</translation>
+ <location filename="../src/gui/connectionvalidator.cpp" line="183"/>
+ <source>Timeout</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
@@ -1663,16 +1730,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor actualiza a la versi?n m?s reciente del servidor y reinicia el cliente.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Error de autenticaci?n: El usuario o contrase?a est?n equivocados. </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Las credenciales proporcionadas no son correctas</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation type="unfinished"/>
</message>
@@ -1680,19 +1762,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1700,27 +1782,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1959,11 +2041,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
@@ -1975,15 +2052,14 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
- <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
+ <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
<message>
@@ -1993,10 +2069,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2039,6 +2121,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ha sido eliminado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ha sido actualizado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 ha sido renombrado a %2. </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 se ha movido a %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2054,17 +2164,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ha sido eliminado.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -2080,33 +2179,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ha sido actualizado.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 ha sido renombrado a %2. </translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 se ha movido a %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2143,67 +2225,67 @@
<translation>Sincronizar Actividad</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>No fue posible leer el archivo de exclusi?n del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una nueva carpeta de m?s de %1 MB ha sido agregada: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una carpeta de un almacenamiento externo ha sido agregada.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2212,41 +2294,41 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2287,11 +2369,6 @@
<translation>No fue posible restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(respaldo)</translation>
@@ -2302,6 +2379,11 @@
<translation>(respaldo %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation type="unfinished"/>
@@ -2372,16 +2454,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>La sincronizaci?n est? pausada.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (La sincronizaci?n est? pausada)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2428,6 +2500,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>La sincronizaci?n est? pausada.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (La sincronizaci?n est? pausada)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2471,16 +2553,6 @@
<translation>Se present? un error al cargar la lista de carpetas desde el servidor. </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Hay conflictos sin resolver. Haz click para m?s detalles. </translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation type="unfinished"/>
@@ -2522,15 +2594,30 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Hay conflictos sin resolver. Haz click para m?s detalles. </translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2578,21 +2665,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 de %2, archivo %3 de %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2752,11 +2834,6 @@
<translation>Configuraciones generales</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Lanzar al Iniciar el Sistema</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation type="unfinished"/>
@@ -2767,11 +2844,6 @@
<translation>Para la Bandeja del Sistema</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Usar ?conos &Monocrom?ticos</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2787,17 +2859,32 @@
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Perdir confirmaci?p?n antes de sincronizar almacenamientos externos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Lanzar al Iniciar el Sistema</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Usar ?conos &Monocrom?ticos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2808,11 +2895,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Perdir confirmaci?p?n antes de sincronizar almacenamientos externos</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2864,11 +2946,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Reinicia && Actualiza</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation type="unfinished"/>
@@ -2889,6 +2966,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Reinicia && Actualiza</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
@@ -2909,6 +2996,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation type="unfinished"/>
@@ -2983,6 +3075,11 @@
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3143,102 +3240,97 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation type="unfinished"/>
</message>
@@ -3359,16 +3451,6 @@
<translation><p>Una nueva versi?n del Cliente %1 est? disponible.</p><p><b>%2</b> est? disponible para descargar. La versi?n instalada es la %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Omitir esta vez</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Obtener la actualizaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation type="unfinished"/>
@@ -3393,6 +3475,16 @@
<source>Update manually</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Omitir esta vez</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Obtener la actualizaci?n</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3417,6 +3509,23 @@
<translation>El servidor Proxy requiere de autenticaci?n</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Ancho de banda para Descarga</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Limitar a</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation type="unfinished"/>
@@ -3439,46 +3548,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Ancho de banda para Descarga</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Sin l?mite</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Limitar a</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Limitar a 3/4 del ancho de banda estimado</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Ancho de banda para Carga</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Limitar autom?ticamente</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Ancho de banda para Carga</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Nombre del servidor proxy</translation>
@@ -3507,6 +3599,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>No fue posible verificar nuevas actualizaciones.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation type="unfinished"/>
@@ -3537,11 +3639,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>No fue posible verificar nuevas actualizaciones.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation type="unfinished"/>
@@ -3552,14 +3649,19 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation>Estado de la actualizaci?n desconocido. No se verific? si hab?a nuevas actualizaciones. </translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
- <source>Update status is unknown: Did not check for new updates.</source>
- <translation>Estado de la actualizaci?n desconocido. No se verific? si hab?a nuevas actualizaciones. </translation>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
@@ -3737,11 +3839,6 @@
<translation><font color="green">Conectado exitosamente a %1: %2 versi?n %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>URL Inv?lido</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Hubo una falla al conectarse a %1 en %2: <br/>%3</translation>
@@ -3752,6 +3849,16 @@
<translation>Expir? el tiempo al tratar de conectarse a %1 en %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Acceso prohibido por el servidor. Para verificar que tengas el acceso correcto, <a href="%1">haz click aqu?</a> para acceder al servicio con tu navegador.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>URL Inv?lido</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation type="unfinished"/>
@@ -3762,11 +3869,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Acceso prohibido por el servidor. Para verificar que tengas el acceso correcto, <a href="%1">haz click aqu?</a> para acceder al servicio con tu navegador.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation type="unfinished"/>
@@ -3972,68 +4074,58 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
+ <source>File names containing the character "%1" are not supported on this file system.</source>
+ <comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
- <source>File names containing the character "%1" are not supported on this file system.</source>
- <comment>%1: the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
+ <source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
+ <source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>Folder name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
+ <source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
+ <source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
- <source>File name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="433"/>
+ <source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
- <source>Folder name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
- <source>File name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="433"/>
- <source>Filename contains trailing spaces.</source>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
@@ -4045,6 +4137,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
@@ -4135,64 +4237,74 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation type="unfinished"/>
</message>
@@ -4200,38 +4312,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4249,12 +4361,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>El archivo ha cambiado desde que fue descubierto</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4311,6 +4417,12 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>El archivo ha cambiado desde que fue descubierto</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4328,39 +4440,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>no fue posible borrar el archivo %1, error: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4373,14 +4485,14 @@
<translation>No fue posible eliminar %1 porque hay un conflicto con el nombre de archivo local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4388,49 +4500,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4487,39 +4599,39 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>C?digo equivocado de HTTP regresado por el servidor. Se esperaba 201, pero se recibi? "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
@@ -4527,22 +4639,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>El archivo %1 no puede ser cargado porque existe otro archivo con el mismo nombre, con diferencias en su uso de may?sculas / min?sculas</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>La carga de %1 excede la cuota de la carpeta</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4550,11 +4651,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>El archivo local cambi? durante la sincronizaci?n. Se resumir?. </translation>
@@ -4584,6 +4680,22 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>La carga de %1 excede la cuota de la carpeta</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4832,6 +4944,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Te compart? algo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Copiar la liga privada al portapapeles</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4864,43 +5002,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Te compart? algo</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Copiar la liga privada al portapapeles</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4916,11 +5028,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -4947,12 +5054,6 @@
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation type="unfinished"/>
@@ -4982,6 +5083,17 @@
<source>Delete</source>
<translation>Borrar</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5083,13 +5195,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Esta conexi?n NO es segura ya que no est? encriptado.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation type="unfinished"/>
@@ -5109,6 +5214,13 @@
<source>The connection is not secure</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Esta conexi?n NO es segura ya que no est? encriptado.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5201,6 +5313,32 @@
<translation>%1 (omitido por un error previo, intentando de nuevo en %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Solo tiene %1 disponible, se necesita de al menos %2 para iniciar</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>No fue posible abrir o crear la base de datos de sincronizaci?n local. Aseg?rate de que tengas permisos de escritura en la carpeta de sincronizaci?n.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Espacio en disco bajo: Las descargas que podr?an reducir el espacio por debajo de %1 se omitieron.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>No hay espacio disponible en el servidor para algunas cargas.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Conflicto no resuelto.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation type="unfinished"/>
@@ -5221,22 +5359,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Conflicto no resuelto.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Solo tiene %1 disponible, se necesita de al menos %2 para iniciar</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>No fue posible abrir o crear la base de datos de sincronizaci?n local. Aseg?rate de que tengas permisos de escritura en la carpeta de sincronizaci?n.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
@@ -5256,16 +5378,6 @@
<source>Cannot open the sync journal</source>
<translation>No se puede abrir el diario de sincronizaci?n</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Espacio en disco bajo: Las descargas que podr?an reducir el espacio por debajo de %1 se omitieron.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>No hay espacio disponible en el servidor para algunas cargas.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5276,7 +5388,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5660,11 +5772,6 @@
<source>Less than a minute</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5672,20 +5779,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5700,6 +5797,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5842,6 +5954,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Por favor inicia sesi?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>No se han configurado carpetas para sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Desconectado de %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Versi?n del Servidor No Soportada</translation>
@@ -5862,31 +5989,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Desconectado de %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Desconectado de las cunetas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Cuenta %1 : %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Por favor inicia sesi?n</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>La sincronizaci?n de cuentas est? deshabilitada</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5908,11 +6010,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>No se han configurado carpetas para sincronizar</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation type="unfinished"/>
@@ -5923,6 +6020,21 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Desconectado de las cunetas:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Cuenta %1 : %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>La sincronizaci?n de cuentas est? deshabilitada</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5931,11 +6043,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>Carpeta &Local</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation type="unfinished"/>
@@ -5971,22 +6078,11 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Elige qu? sincronizar</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation type="unfinished"/>
@@ -6001,6 +6097,22 @@
<source>Erase local folder and start a clean sync</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Elige qu? sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>Carpeta &Local</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6041,6 +6153,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>en el futuro</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>ahora</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Hace alg?n tiempo</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6081,57 +6238,12 @@
<source>Synced %1</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>en el futuro</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>ahora</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Hace alg?n tiempo</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6377,6 +6489,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6566,16 +6721,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 MB</translation>
@@ -6590,6 +6735,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6823,16 +6978,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Preparando para sincronizar</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Preparando para sincronizar</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>La sincronizaci?n est? pausada</translation>
@@ -6891,4 +7046,17 @@
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_es_CR.ts nextcloud-desktop-3.16.6/translations/client_es_CR.ts
--- nextcloud-desktop-3.16.4/translations/client_es_CR.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_es_CR.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
@@ -570,7 +562,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Las carpetas no marcadas ser?n <b>eliminadas</b> de tu sistema de archivos local y ya no ser?n sincronizados a esta computadora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Cancelar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Aplicar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Conectado con <server> como <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Sincronizar todo</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Aplicar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Cancelar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Conectado con <server> como <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>No hay cuentas configuradas.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation type="unfinished"/>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>No hay cuentas configuradas.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation type="unfinished"/>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -730,12 +738,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Abrir carpeta</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -774,16 +776,6 @@
<translation>Reiniciar sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Reanudar sincronizaci?n</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Pausar sincronizaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Eliminar la conexi?n de sincronizaci?n de carpetas</translation>
@@ -809,21 +801,11 @@
<translation>Fall? la creaci?n de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar la Eliminaci?n de la Conexi?n de Sincronizaci?n de Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>?Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrar? ning?n archivo.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar la Conexi?n de Sincronizaci?n de la Carpeta</translation>
@@ -853,23 +835,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -883,33 +865,43 @@
<translation>La operaci?n de sincronizaci?n est? en curso. <br/>?Deseas terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes l?mites</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 de %2 en uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Actualmente no hay informaci?n disponible del espacio usado.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 en uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
@@ -928,80 +920,126 @@
<translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Cerraste sesi?n en %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Abrir carpeta</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Reanudar sincronizaci?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Pausar sincronizaci?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>?Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrar? ning?n archivo.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>No hay %1 conexi?n configurada. </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes l?mites</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Actualmente no hay informaci?n disponible del espacio usado.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>No hay %1 conexi?n configurada. </translation>
+ </message>
</context>
<context>
<name>OCC::AccountSetupFromCommandLineJob</name>
@@ -1115,11 +1153,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation type="unfinished"/>
@@ -1130,6 +1163,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Seleccionar un certificado</translation>
@@ -1180,46 +1218,46 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Error al acceder el archivo de configuraci?n</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation type="unfinished"/>
</message>
@@ -1261,6 +1299,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1268,6 +1345,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
@@ -1472,7 +1554,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir metadatos a la base de datos</translation>
</message>
@@ -1602,21 +1684,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1630,28 +1697,28 @@
%1</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Error de autenticaci?n: El usuario o contrase?a est?n equivocados. </translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="183"/>
- <source>Timeout</source>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Las credenciales proporcionadas no son correctas</translation>
+ <location filename="../src/gui/connectionvalidator.cpp" line="183"/>
+ <source>Timeout</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
@@ -1663,16 +1730,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor actualiza a la versi?n m?s reciente del servidor y reinicia el cliente.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Error de autenticaci?n: El usuario o contrase?a est?n equivocados. </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Las credenciales proporcionadas no son correctas</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation type="unfinished"/>
</message>
@@ -1680,19 +1762,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1700,27 +1782,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1959,11 +2041,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
@@ -1975,15 +2052,14 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
- <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
+ <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
<message>
@@ -1993,10 +2069,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2039,6 +2121,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ha sido eliminado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ha sido actualizado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 ha sido renombrado a %2. </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 se ha movido a %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2054,17 +2164,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ha sido eliminado.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -2080,33 +2179,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ha sido actualizado.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 ha sido renombrado a %2. </translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 se ha movido a %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2143,67 +2225,67 @@
<translation>Sincronizar Actividad</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>No fue posible leer el archivo de exclusi?n del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una nueva carpeta de m?s de %1 MB ha sido agregada: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una carpeta de un almacenamiento externo ha sido agregada.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2212,41 +2294,41 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2287,11 +2369,6 @@
<translation>No fue posible restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(respaldo)</translation>
@@ -2302,6 +2379,11 @@
<translation>(respaldo %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation type="unfinished"/>
@@ -2372,16 +2454,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>La sincronizaci?n est? pausada.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (La sincronizaci?n est? pausada)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2428,6 +2500,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>La sincronizaci?n est? pausada.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (La sincronizaci?n est? pausada)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2471,16 +2553,6 @@
<translation>Se present? un error al cargar la lista de carpetas desde el servidor. </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Hay conflictos sin resolver. Haz click para m?s detalles. </translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation type="unfinished"/>
@@ -2522,15 +2594,30 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Hay conflictos sin resolver. Haz click para m?s detalles. </translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2578,21 +2665,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 de %2, archivo %3 de %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2752,11 +2834,6 @@
<translation>Configuraciones generales</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Lanzar al Iniciar el Sistema</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation type="unfinished"/>
@@ -2767,11 +2844,6 @@
<translation>Para la Bandeja del Sistema</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Usar ?conos &Monocrom?ticos</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2787,17 +2859,32 @@
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Perdir confirmaci?p?n antes de sincronizar almacenamientos externos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Lanzar al Iniciar el Sistema</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Usar ?conos &Monocrom?ticos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2808,11 +2895,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Perdir confirmaci?p?n antes de sincronizar almacenamientos externos</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2864,11 +2946,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Reinicia && Actualiza</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation type="unfinished"/>
@@ -2889,6 +2966,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Reinicia && Actualiza</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
@@ -2909,6 +2996,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation type="unfinished"/>
@@ -2983,6 +3075,11 @@
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3143,102 +3240,97 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation type="unfinished"/>
</message>
@@ -3359,16 +3451,6 @@
<translation><p>Una nueva versi?n del Cliente %1 est? disponible.</p><p><b>%2</b> est? disponible para descargar. La versi?n instalada es la %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Omitir esta vez</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Obtener la actualizaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation type="unfinished"/>
@@ -3393,6 +3475,16 @@
<source>Update manually</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Omitir esta vez</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Obtener la actualizaci?n</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3417,6 +3509,23 @@
<translation>El servidor Proxy requiere de autenticaci?n</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Ancho de banda para Descarga</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Limitar a</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation type="unfinished"/>
@@ -3439,46 +3548,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Ancho de banda para Descarga</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Sin l?mite</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Limitar a</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Limitar a 3/4 del ancho de banda estimado</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Ancho de banda para Carga</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Limitar autom?ticamente</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Ancho de banda para Carga</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Nombre del servidor proxy</translation>
@@ -3507,6 +3599,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>No fue posible verificar nuevas actualizaciones.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation type="unfinished"/>
@@ -3537,11 +3639,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>No fue posible verificar nuevas actualizaciones.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation type="unfinished"/>
@@ -3552,14 +3649,19 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation>Estado de la actualizaci?n desconocido. No se verific? si hab?a nuevas actualizaciones. </translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
- <source>Update status is unknown: Did not check for new updates.</source>
- <translation>Estado de la actualizaci?n desconocido. No se verific? si hab?a nuevas actualizaciones. </translation>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
@@ -3737,11 +3839,6 @@
<translation><font color="green">Conectado exitosamente a %1: %2 versi?n %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>URL Inv?lido</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Hubo una falla al conectarse a %1 en %2: <br/>%3</translation>
@@ -3752,6 +3849,16 @@
<translation>Expir? el tiempo al tratar de conectarse a %1 en %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Acceso prohibido por el servidor. Para verificar que tengas el acceso correcto, <a href="%1">haz click aqu?</a> para acceder al servicio con tu navegador.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>URL Inv?lido</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation type="unfinished"/>
@@ -3762,11 +3869,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Acceso prohibido por el servidor. Para verificar que tengas el acceso correcto, <a href="%1">haz click aqu?</a> para acceder al servicio con tu navegador.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation type="unfinished"/>
@@ -3972,68 +4074,58 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
+ <source>File names containing the character "%1" are not supported on this file system.</source>
+ <comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
- <source>File names containing the character "%1" are not supported on this file system.</source>
- <comment>%1: the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
+ <source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
+ <source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>Folder name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
+ <source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
+ <source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
- <source>File name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="433"/>
+ <source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
- <source>Folder name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
- <source>File name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="433"/>
- <source>Filename contains trailing spaces.</source>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
@@ -4045,6 +4137,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
@@ -4135,64 +4237,74 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation type="unfinished"/>
</message>
@@ -4200,38 +4312,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4249,12 +4361,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>El archivo ha cambiado desde que fue descubierto</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4311,6 +4417,12 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>El archivo ha cambiado desde que fue descubierto</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4328,39 +4440,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>no fue posible borrar el archivo %1, error: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4373,14 +4485,14 @@
<translation>No fue posible eliminar %1 porque hay un conflicto con el nombre de archivo local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4388,49 +4500,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4487,39 +4599,39 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>C?digo equivocado de HTTP regresado por el servidor. Se esperaba 201, pero se recibi? "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
@@ -4527,22 +4639,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>El archivo %1 no puede ser cargado porque existe otro archivo con el mismo nombre, con diferencias en su uso de may?sculas / min?sculas</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>La carga de %1 excede la cuota de la carpeta</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4550,11 +4651,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>El archivo local cambi? durante la sincronizaci?n. Se resumir?. </translation>
@@ -4584,6 +4680,22 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>La carga de %1 excede la cuota de la carpeta</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4832,6 +4944,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Te compart? algo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Copiar la liga privada al portapapeles</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4864,43 +5002,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Te compart? algo</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Copiar la liga privada al portapapeles</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4916,11 +5028,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -4947,12 +5054,6 @@
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation type="unfinished"/>
@@ -4982,6 +5083,17 @@
<source>Delete</source>
<translation>Borrar</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5083,13 +5195,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Esta conexi?n NO es segura ya que no est? encriptado.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation type="unfinished"/>
@@ -5109,6 +5214,13 @@
<source>The connection is not secure</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Esta conexi?n NO es segura ya que no est? encriptado.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5201,6 +5313,32 @@
<translation>%1 (omitido por un error previo, intentando de nuevo en %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Solo tiene %1 disponible, se necesita de al menos %2 para iniciar</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>No fue posible abrir o crear la base de datos de sincronizaci?n local. Aseg?rate de que tengas permisos de escritura en la carpeta de sincronizaci?n.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Espacio en disco bajo: Las descargas que podr?an reducir el espacio por debajo de %1 se omitieron.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>No hay espacio disponible en el servidor para algunas cargas.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Conflicto no resuelto.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation type="unfinished"/>
@@ -5221,22 +5359,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Conflicto no resuelto.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Solo tiene %1 disponible, se necesita de al menos %2 para iniciar</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>No fue posible abrir o crear la base de datos de sincronizaci?n local. Aseg?rate de que tengas permisos de escritura en la carpeta de sincronizaci?n.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
@@ -5256,16 +5378,6 @@
<source>Cannot open the sync journal</source>
<translation>No se puede abrir el diario de sincronizaci?n</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Espacio en disco bajo: Las descargas que podr?an reducir el espacio por debajo de %1 se omitieron.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>No hay espacio disponible en el servidor para algunas cargas.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5276,7 +5388,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5660,11 +5772,6 @@
<source>Less than a minute</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5672,20 +5779,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5700,6 +5797,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5842,6 +5954,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Por favor inicia sesi?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>No se han configurado carpetas para sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Desconectado de %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Versi?n del Servidor No Soportada</translation>
@@ -5862,31 +5989,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Desconectado de %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Desconectado de las cunetas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Cuenta %1 : %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Por favor inicia sesi?n</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>La sincronizaci?n de cuentas est? deshabilitada</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5908,11 +6010,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>No se han configurado carpetas para sincronizar</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation type="unfinished"/>
@@ -5923,6 +6020,21 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Desconectado de las cunetas:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Cuenta %1 : %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>La sincronizaci?n de cuentas est? deshabilitada</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5931,11 +6043,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>Carpeta &Local</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation type="unfinished"/>
@@ -5971,22 +6078,11 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Elige qu? sincronizar</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation type="unfinished"/>
@@ -6001,6 +6097,22 @@
<source>Erase local folder and start a clean sync</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Elige qu? sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>Carpeta &Local</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6041,6 +6153,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>en el futuro</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>ahora</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Hace alg?n tiempo</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6081,57 +6238,12 @@
<source>Synced %1</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>en el futuro</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>ahora</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Hace alg?n tiempo</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6377,6 +6489,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6566,16 +6721,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6590,6 +6735,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6823,16 +6978,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Preparando para sincronizar</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Preparando para sincronizar</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>La sincronizaci?n est? pausada</translation>
@@ -6891,4 +7046,17 @@
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_es_DO.ts nextcloud-desktop-3.16.6/translations/client_es_DO.ts
--- nextcloud-desktop-3.16.4/translations/client_es_DO.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_es_DO.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
@@ -570,7 +562,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Las carpetas no marcadas ser?n <b>eliminadas</b> de tu sistema de archivos local y ya no ser?n sincronizados a esta computadora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Cancelar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Aplicar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Conectado con <server> como <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Sincronizar todo</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Aplicar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Cancelar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Conectado con <server> como <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>No hay cuentas configuradas.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation type="unfinished"/>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>No hay cuentas configuradas.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation type="unfinished"/>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -730,12 +738,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Abrir carpeta</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -774,16 +776,6 @@
<translation>Reiniciar sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Reanudar sincronizaci?n</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Pausar sincronizaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Eliminar la conexi?n de sincronizaci?n de carpetas</translation>
@@ -809,21 +801,11 @@
<translation>Fall? la creaci?n de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar la Eliminaci?n de la Conexi?n de Sincronizaci?n de Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>?Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrar? ning?n archivo.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar la Conexi?n de Sincronizaci?n de la Carpeta</translation>
@@ -853,23 +835,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -883,33 +865,43 @@
<translation>La operaci?n de sincronizaci?n est? en curso. <br/>?Deseas terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes l?mites</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 de %2 en uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Actualmente no hay informaci?n disponible del espacio usado.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 en uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
@@ -928,80 +920,126 @@
<translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Cerraste sesi?n en %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Abrir carpeta</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Reanudar sincronizaci?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Pausar sincronizaci?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>?Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrar? ning?n archivo.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>No hay %1 conexi?n configurada. </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes l?mites</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Actualmente no hay informaci?n disponible del espacio usado.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>No hay %1 conexi?n configurada. </translation>
+ </message>
</context>
<context>
<name>OCC::AccountSetupFromCommandLineJob</name>
@@ -1115,11 +1153,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation type="unfinished"/>
@@ -1130,6 +1163,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Seleccionar un certificado</translation>
@@ -1180,46 +1218,46 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Error al acceder el archivo de configuraci?n</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation type="unfinished"/>
</message>
@@ -1261,6 +1299,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1268,6 +1345,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
@@ -1472,7 +1554,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir metadatos a la base de datos</translation>
</message>
@@ -1602,21 +1684,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1630,28 +1697,28 @@
%1</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Error de autenticaci?n: El usuario o contrase?a est?n equivocados. </translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="183"/>
- <source>Timeout</source>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Las credenciales proporcionadas no son correctas</translation>
+ <location filename="../src/gui/connectionvalidator.cpp" line="183"/>
+ <source>Timeout</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
@@ -1663,16 +1730,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor actualiza a la versi?n m?s reciente del servidor y reinicia el cliente.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Error de autenticaci?n: El usuario o contrase?a est?n equivocados. </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Las credenciales proporcionadas no son correctas</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation type="unfinished"/>
</message>
@@ -1680,19 +1762,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1700,27 +1782,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1959,11 +2041,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
@@ -1975,15 +2052,14 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
- <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
+ <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
<message>
@@ -1993,10 +2069,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2039,6 +2121,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ha sido eliminado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ha sido actualizado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 ha sido renombrado a %2. </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 se ha movido a %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2054,17 +2164,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ha sido eliminado.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -2080,33 +2179,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ha sido actualizado.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 ha sido renombrado a %2. </translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 se ha movido a %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2143,67 +2225,67 @@
<translation>Sincronizar Actividad</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>No fue posible leer el archivo de exclusi?n del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una nueva carpeta de m?s de %1 MB ha sido agregada: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una carpeta de un almacenamiento externo ha sido agregada.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2212,41 +2294,41 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2287,11 +2369,6 @@
<translation>No fue posible restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(respaldo)</translation>
@@ -2302,6 +2379,11 @@
<translation>(respaldo %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation type="unfinished"/>
@@ -2372,16 +2454,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>La sincronizaci?n est? pausada.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (La sincronizaci?n est? pausada)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2428,6 +2500,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>La sincronizaci?n est? pausada.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (La sincronizaci?n est? pausada)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2471,16 +2553,6 @@
<translation>Se present? un error al cargar la lista de carpetas desde el servidor. </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Hay conflictos sin resolver. Haz click para m?s detalles. </translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation type="unfinished"/>
@@ -2522,15 +2594,30 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Hay conflictos sin resolver. Haz click para m?s detalles. </translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2578,21 +2665,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 de %2, archivo %3 de %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2752,11 +2834,6 @@
<translation>Configuraciones generales</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Lanzar al Iniciar el Sistema</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation type="unfinished"/>
@@ -2767,11 +2844,6 @@
<translation>Para la Bandeja del Sistema</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Usar ?conos &Monocrom?ticos</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2787,17 +2859,32 @@
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Perdir confirmaci?p?n antes de sincronizar almacenamientos externos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Lanzar al Iniciar el Sistema</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Usar ?conos &Monocrom?ticos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2808,11 +2895,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Perdir confirmaci?p?n antes de sincronizar almacenamientos externos</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2864,11 +2946,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Reinicia && Actualiza</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation type="unfinished"/>
@@ -2889,6 +2966,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Reinicia && Actualiza</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
@@ -2909,6 +2996,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation type="unfinished"/>
@@ -2983,6 +3075,11 @@
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3143,102 +3240,97 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation type="unfinished"/>
</message>
@@ -3359,16 +3451,6 @@
<translation><p>Una nueva versi?n del Cliente %1 est? disponible.</p><p><b>%2</b> est? disponible para descargar. La versi?n instalada es la %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Omitir esta vez</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Obtener la actualizaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation type="unfinished"/>
@@ -3393,6 +3475,16 @@
<source>Update manually</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Omitir esta vez</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Obtener la actualizaci?n</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3417,6 +3509,23 @@
<translation>El servidor Proxy requiere de autenticaci?n</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Ancho de banda para Descarga</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Limitar a</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation type="unfinished"/>
@@ -3439,46 +3548,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Ancho de banda para Descarga</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Sin l?mite</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Limitar a</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Limitar a 3/4 del ancho de banda estimado</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Ancho de banda para Carga</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Limitar autom?ticamente</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Ancho de banda para Carga</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Nombre del servidor proxy</translation>
@@ -3507,6 +3599,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>No fue posible verificar nuevas actualizaciones.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation type="unfinished"/>
@@ -3537,11 +3639,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>No fue posible verificar nuevas actualizaciones.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation type="unfinished"/>
@@ -3552,14 +3649,19 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation>Estado de la actualizaci?n desconocido. No se verific? si hab?a nuevas actualizaciones. </translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
- <source>Update status is unknown: Did not check for new updates.</source>
- <translation>Estado de la actualizaci?n desconocido. No se verific? si hab?a nuevas actualizaciones. </translation>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
@@ -3737,11 +3839,6 @@
<translation><font color="green">Conectado exitosamente a %1: %2 versi?n %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>URL Inv?lido</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Hubo una falla al conectarse a %1 en %2: <br/>%3</translation>
@@ -3752,6 +3849,16 @@
<translation>Expir? el tiempo al tratar de conectarse a %1 en %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Acceso prohibido por el servidor. Para verificar que tengas el acceso correcto, <a href="%1">haz click aqu?</a> para acceder al servicio con tu navegador.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>URL Inv?lido</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation type="unfinished"/>
@@ -3762,11 +3869,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Acceso prohibido por el servidor. Para verificar que tengas el acceso correcto, <a href="%1">haz click aqu?</a> para acceder al servicio con tu navegador.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation type="unfinished"/>
@@ -3972,68 +4074,58 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
+ <source>File names containing the character "%1" are not supported on this file system.</source>
+ <comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
- <source>File names containing the character "%1" are not supported on this file system.</source>
- <comment>%1: the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
+ <source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
+ <source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>Folder name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
+ <source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
+ <source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
- <source>File name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="433"/>
+ <source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
- <source>Folder name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
- <source>File name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="433"/>
- <source>Filename contains trailing spaces.</source>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
@@ -4045,6 +4137,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
@@ -4135,64 +4237,74 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation type="unfinished"/>
</message>
@@ -4200,38 +4312,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4249,12 +4361,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>El archivo ha cambiado desde que fue descubierto</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4311,6 +4417,12 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>El archivo ha cambiado desde que fue descubierto</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4328,39 +4440,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>no fue posible borrar el archivo %1, error: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4373,14 +4485,14 @@
<translation>No fue posible eliminar %1 porque hay un conflicto con el nombre de archivo local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4388,49 +4500,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4487,39 +4599,39 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>C?digo equivocado de HTTP regresado por el servidor. Se esperaba 201, pero se recibi? "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
@@ -4527,22 +4639,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>El archivo %1 no puede ser cargado porque existe otro archivo con el mismo nombre, con diferencias en su uso de may?sculas / min?sculas</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>La carga de %1 excede la cuota de la carpeta</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4550,11 +4651,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>El archivo local cambi? durante la sincronizaci?n. Se resumir?. </translation>
@@ -4584,6 +4680,22 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>La carga de %1 excede la cuota de la carpeta</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4832,6 +4944,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Te compart? algo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Copiar la liga privada al portapapeles</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4864,43 +5002,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Te compart? algo</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Copiar la liga privada al portapapeles</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4916,11 +5028,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -4947,12 +5054,6 @@
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation type="unfinished"/>
@@ -4982,6 +5083,17 @@
<source>Delete</source>
<translation>Borrar</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5083,13 +5195,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Esta conexi?n NO es segura ya que no est? encriptado.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation type="unfinished"/>
@@ -5109,6 +5214,13 @@
<source>The connection is not secure</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Esta conexi?n NO es segura ya que no est? encriptado.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5201,6 +5313,32 @@
<translation>%1 (omitido por un error previo, intentando de nuevo en %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Solo tiene %1 disponible, se necesita de al menos %2 para iniciar</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>No fue posible abrir o crear la base de datos de sincronizaci?n local. Aseg?rate de que tengas permisos de escritura en la carpeta de sincronizaci?n.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Espacio en disco bajo: Las descargas que podr?an reducir el espacio por debajo de %1 se omitieron.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>No hay espacio disponible en el servidor para algunas cargas.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Conflicto no resuelto.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation type="unfinished"/>
@@ -5221,22 +5359,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Conflicto no resuelto.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Solo tiene %1 disponible, se necesita de al menos %2 para iniciar</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>No fue posible abrir o crear la base de datos de sincronizaci?n local. Aseg?rate de que tengas permisos de escritura en la carpeta de sincronizaci?n.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
@@ -5256,16 +5378,6 @@
<source>Cannot open the sync journal</source>
<translation>No se puede abrir el diario de sincronizaci?n</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Espacio en disco bajo: Las descargas que podr?an reducir el espacio por debajo de %1 se omitieron.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>No hay espacio disponible en el servidor para algunas cargas.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5276,7 +5388,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5660,11 +5772,6 @@
<source>Less than a minute</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5672,20 +5779,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5700,6 +5797,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5842,6 +5954,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Por favor inicia sesi?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>No se han configurado carpetas para sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Desconectado de %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Versi?n del Servidor No Soportada</translation>
@@ -5862,31 +5989,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Desconectado de %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Desconectado de las cunetas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Cuenta %1 : %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Por favor inicia sesi?n</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>La sincronizaci?n de cuentas est? deshabilitada</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5908,11 +6010,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>No se han configurado carpetas para sincronizar</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation type="unfinished"/>
@@ -5923,6 +6020,21 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Desconectado de las cunetas:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Cuenta %1 : %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>La sincronizaci?n de cuentas est? deshabilitada</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5931,11 +6043,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>Carpeta &Local</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation type="unfinished"/>
@@ -5971,22 +6078,11 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Elige qu? sincronizar</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation type="unfinished"/>
@@ -6001,6 +6097,22 @@
<source>Erase local folder and start a clean sync</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Elige qu? sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>Carpeta &Local</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6041,6 +6153,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>en el futuro</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>ahora</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Hace alg?n tiempo</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6081,57 +6238,12 @@
<source>Synced %1</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>en el futuro</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>ahora</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Hace alg?n tiempo</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6377,6 +6489,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6566,16 +6721,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6590,6 +6735,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6823,16 +6978,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Preparando para sincronizar</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Preparando para sincronizar</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>La sincronizaci?n est? pausada</translation>
@@ -6891,4 +7046,17 @@
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_es_EC.ts nextcloud-desktop-3.16.6/translations/client_es_EC.ts
--- nextcloud-desktop-3.16.4/translations/client_es_EC.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_es_EC.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Importaci?n heredada</translation>
</message>
@@ -570,7 +562,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>No se pudieron importar las cuentas desde la configuraci?n del cliente heredado.</translation>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Espacio de almacenamiento: ?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Las carpetas no marcadas ser?n <b>eliminadas</b> de tu sistema de archivos local y ya no ser?n sincronizados a esta computadora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Cancelar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Aplicar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Conectado con <server> como <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Sincronizar todo</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Aplicar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Espacio de almacenamiento: ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Cancelar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Conectado con <server> como <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>No hay cuentas configuradas.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>Cifrado de extremo a extremo con archivos virtuales</translation>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>No hay cuentas configuradas.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation>Mostrar mnem?nico</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>Se ha habilitado el cifrado de extremo a extremo para esta cuenta</translation>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -732,12 +740,6 @@
<translation>No se pudo cifrar la carpeta porque ya no existe</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Abrir carpeta</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Cifrar</translation>
@@ -776,16 +778,6 @@
<translation>Reiniciar sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Reanudar sincronizaci?n</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Pausar sincronizaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Eliminar la conexi?n de sincronizaci?n de carpetas</translation>
@@ -811,21 +803,11 @@
<translation>Fall? la creaci?n de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>No se pudo crear la carpeta local <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar la Eliminaci?n de la Conexi?n de Sincronizaci?n de Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>?Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrar? ning?n archivo.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar la Conexi?n de Sincronizaci?n de la Carpeta</translation>
@@ -859,24 +841,24 @@
<translation>Mnem?nico de cifrado de extremo a extremo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>Para proteger tu Identidad Criptogr?fica, la ciframos con un mnem?nico de 12 palabras del diccionario. Por favor, an?talas y gu?rdalas en un lugar seguro. Las necesitar?s para agregar otros dispositivos a tu cuenta (como tu tel?fono m?vil o port?til).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>Desactivar cifrado de extremo a extremo</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>?Deseas desactivar el cifrado de extremo a extremo para %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>Eliminar el cifrado de extremo a extremo eliminar? los archivos sincronizados localmente que est?n cifrados.<br>Los archivos cifrados permanecer?n en el servidor.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -889,34 +871,44 @@
<translation>La operaci?n de sincronizaci?n est? en curso. <br/>?Deseas terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes l?mites</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 de %2 en uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Actualmente no hay informaci?n disponible del espacio usado.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 en uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 como %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>Se ha habilitado el cifrado de extremo a extremo en esta cuenta con otro dispositivo.<br>Se puede habilitar en este dispositivo ingresando tu mnem?nico.<br>Esto permitir? la sincronizaci?n de carpetas cifradas existentes.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>?La versi?n del servidor %1 no es compatible! Procede bajo tu propio riesgo.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Configurar el cifrado</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Esta cuenta admite el cifrado de extremo a extremo</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -934,79 +926,125 @@
<translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>El servidor %1 est? siendo redirigido actualmente o tu conexi?n est? detr?s de un portal cautivo.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Cerraste sesi?n en %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Conectando a %1 ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Error de configuraci?n del servidor: %1 en %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Abrir carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>No hay %1 conexi?n configurada. </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Reanudar sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Pausar sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>No se pudo crear la carpeta local <i>%1</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>?Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrar? ning?n archivo.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>Para proteger tu Identidad Criptogr?fica, la ciframos con un mnem?nico de 12 palabras del diccionario. Por favor, an?talas y gu?rdalas en un lugar seguro. Las necesitar?s para agregar otros dispositivos a tu cuenta (como tu tel?fono m?vil o port?til).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>Desactivar cifrado de extremo a extremo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>?Deseas desactivar el cifrado de extremo a extremo para %1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>Eliminar el cifrado de extremo a extremo eliminar? los archivos sincronizados localmente que est?n cifrados.<br>Los archivos cifrados permanecer?n en el servidor.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes l?mites</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 de %2 en uso</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Actualmente no hay informaci?n disponible del espacio usado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 como %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>?La versi?n del servidor %1 no es compatible! Procede bajo tu propio riesgo.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>El servidor %1 est? siendo redirigido actualmente o tu conexi?n est? detr?s de un portal cautivo.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Conectando a %1 ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>Se ha habilitado el cifrado de extremo a extremo en esta cuenta con otro dispositivo.<br>Se puede habilitar en este dispositivo ingresando tu mnem?nico.<br>Esto permitir? la sincronizaci?n de carpetas cifradas existentes.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Error de configuraci?n del servidor: %1 en %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Esta cuenta admite el cifrado de extremo a extremo</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Configurar el cifrado</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>No hay %1 conexi?n configurada. </translation>
</message>
</context>
<context>
@@ -1121,11 +1159,6 @@
<translation>Certificado y clave (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Navegar ?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Contrase?a del certificado:</translation>
@@ -1136,6 +1169,11 @@
<translation>Se recomienda encarecidamente un paquete pkcs12 cifrado, ya que se almacenar? una copia en el archivo de configuraci?n.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Navegar ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Seleccionar un certificado</translation>
@@ -1186,46 +1224,46 @@
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Error al acceder el archivo de configuraci?n</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>Ocurri? un error al acceder al archivo de configuraci?n en %1. Aseg?rate de que el archivo pueda ser accedido por tu cuenta de sistema.</translation>
</message>
@@ -1267,6 +1305,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1274,6 +1351,11 @@
<translation>No se puede subir el archivo %1 porque ya existe otro archivo con el mismo nombre, diferenci?ndose solo en may?sculas y min?sculas</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>El archivo %1 tiene una hora de modificaci?n no v?lida. No se debe cargar en el servidor.</translation>
@@ -1478,7 +1560,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir metadatos a la base de datos</translation>
</message>
@@ -1608,21 +1690,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>?Deseas eliminar el directorio <i>%1</i> y todos sus contenidos permanentemente?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>?Deseas eliminar el archivo <i>%1</i> permanentemente?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Confirmar eliminaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1637,30 +1704,30 @@
<translation>Error al mover el archivo:
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>No se ha configurado una cuenta de Nextcloud</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>?Deseas eliminar el directorio <i>%1</i> y todos sus contenidos permanentemente?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Error de autenticaci?n: El usuario o contrase?a est?n equivocados. </translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>?Deseas eliminar el archivo <i>%1</i> permanentemente?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Confirmar eliminaci?n</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Tiempo de espera agotado</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Las credenciales proporcionadas no son correctas</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>El servidor configurado para este cliente es demasiado antiguo</translation>
@@ -1670,16 +1737,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor actualiza a la versi?n m?s reciente del servidor y reinicia el cliente.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Error de autenticaci?n: El usuario o contrase?a est?n equivocados. </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>No se ha configurado una cuenta de Nextcloud</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Las credenciales proporcionadas no son correctas</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Error al cancelar la eliminaci?n de un archivo</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>Error al cancelar la eliminaci?n de %1</translation>
</message>
@@ -1687,19 +1769,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Error del servidor: ?La respuesta de PROPFIND no tiene formato XML!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1707,27 +1789,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Error al abrir el directorio %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Directorio no accesible en el cliente, permiso denegado</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Directorio no encontrado: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>La codificaci?n del nombre de archivo no es v?lida</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Error al leer el directorio %1</translation>
</message>
@@ -1967,11 +2049,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>La URL de votaci?n no comienza con HTTPS a pesar de que la URL de inicio de sesi?n comenz? con HTTPS. El inicio de sesi?n no ser? posible porque esto podr?a ser un problema de seguridad. Por favor, contacta a tu administrador.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>La URL del servidor devuelta no comienza con HTTPS a pesar de que la URL de inicio de sesi?n comenz? con HTTPS. El inicio de sesi?n no ser? posible porque esto podr?a ser un problema de seguridad. Por favor, contacta a tu administrador.</translation>
@@ -1983,28 +2060,33 @@
<translation>Error devuelto por el servidor: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>La URL de votaci?n no comienza con HTTPS a pesar de que la URL de inicio de sesi?n comenz? con HTTPS. El inicio de sesi?n no ser? posible porque esto podr?a ser un problema de seguridad. Por favor, contacta a tu administrador.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Hubo un error al acceder al punto final "token": <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>No se pudo analizar el JSON devuelto por el servidor: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>La respuesta del servidor no contiene todos los campos esperados</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>No se pudo analizar el JSON devuelto por el servidor: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2047,6 +2129,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ha sido eliminado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ha sido actualizado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 ha sido renombrado a %2. </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 se ha movido a %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2062,17 +2172,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otros archivo(s) han sido eliminados.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ha sido eliminado.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>Se han agregado %1 y %n otro(s) archivo(s).</numerusform><numerusform>Se han agregado %1 y %n otro(s) archivo(s).</numerusform><numerusform>Se han agregado %1 y %n otro(s) archivo(s).</numerusform></translation>
@@ -2088,33 +2187,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ha sido actualizado.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 ha sido renombrado a %2. </translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 se ha movido a %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2151,67 +2233,67 @@
<translation>Sincronizar Actividad</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>No fue posible leer el archivo de exclusi?n del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una nueva carpeta de m?s de %1 MB ha sido agregada: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una carpeta de un almacenamiento externo ha sido agregada.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>La carpeta %1 fue creada previamente pero fue excluida de la sincronizaci?n. Los datos dentro de ella no se sincronizar?n.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>El archivo %1 fue creado previamente pero fue excluido de la sincronizaci?n. No se sincronizar?.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2224,41 +2306,41 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2299,11 +2381,6 @@
<translation>No fue posible restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>Se encontr? un antiguo registro de sincronizaci?n "%1", pero no se pudo eliminar. Por favor, aseg?rate de que ninguna aplicaci?n lo est? utilizando actualmente.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(respaldo)</translation>
@@ -2314,6 +2391,11 @@
<translation>(respaldo %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>Se encontr? un antiguo registro de sincronizaci?n "%1", pero no se pudo eliminar. Por favor, aseg?rate de que ninguna aplicaci?n lo est? utilizando actualmente.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Estado indefinido.</translation>
@@ -2384,16 +2466,6 @@
<translation>La solicitud de sincronizaci?n fue cancelada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>La sincronizaci?n est? pausada.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (La sincronizaci?n est? pausada)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2440,6 +2512,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>La sincronizaci?n est? pausada.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (La sincronizaci?n est? pausada)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2483,16 +2565,6 @@
<translation>Se present? un error al cargar la lista de carpetas desde el servidor. </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Obteniendo lista de carpetas desde el servidor...</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Hay conflictos sin resolver. Haz click para m?s detalles. </translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>El soporte de archivos virtuales est? activado.</translation>
@@ -2534,16 +2606,31 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Hay conflictos sin resolver. Haz click para m?s detalles. </translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation type="unfinished"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Obteniendo lista de carpetas desde el servidor...</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2590,21 +2677,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 de %2, archivo %3 de %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>Esperando por %n otra(s) carpeta(s)...</numerusform><numerusform>Esperando por %n otra(s) carpeta(s)...</numerusform><numerusform>Esperando por %n otra(s) carpeta(s)...</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>Esperando por %n otra(s) carpeta(s)...</numerusform><numerusform>Esperando por %n otra(s) carpeta(s)...</numerusform><numerusform>Esperando por %n otra(s) carpeta(s)...</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2764,11 +2846,6 @@
<translation>Configuraciones generales</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Lanzar al Iniciar el Sistema</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>Mostrar notificaciones de llamadas</translation>
@@ -2779,11 +2856,6 @@
<translation>Para la Bandeja del Sistema</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Usar ?conos &Monocrom?ticos</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2799,17 +2871,32 @@
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Perdir confirmaci?p?n antes de sincronizar almacenamientos externos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Lanzar al Iniciar el Sistema</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Usar ?conos &Monocrom?ticos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2820,11 +2907,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Perdir confirmaci?p?n antes de sincronizar almacenamientos externos</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2876,11 +2958,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Reinicia && Actualiza</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation type="unfinished"/>
@@ -2901,6 +2978,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Reinicia && Actualiza</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Notificaciones del servidor que requieren atenci?n.</translation>
@@ -2921,6 +3008,11 @@
<translation>No puedes desactivar el inicio autom?tico porque el inicio autom?tico a nivel de sistema est? habilitado.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>estable</translation>
@@ -2995,6 +3087,11 @@
<source>Debug archive is created at %1</source>
<translation>El archivo de depuraci?n se ha creado en %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3159,102 +3256,97 @@
<translation>Nombre de archivo nuevo</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Renombrar archivo</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>No se pudo sincronizar el archivo "%1" porque el nombre contiene caracteres que no est?n permitidos en este sistema.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>Los siguientes caracteres no est?n permitidos en el sistema: * " | & ? , ; : \ / ~ < > espacios al inicio o al final</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Verificando permisos de renombrado...</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>No tienes permiso para renombrar este archivo. Por favor, pide al autor del archivo que lo renombre.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>Error al obtener los permisos con el error %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>El nombre de archivo contiene espacios al inicio y al final.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>El nombre de archivo contiene espacios al inicio.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>El nombre de archivo contiene espacios al final.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>Usar nombre inv?lido</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>El nombre de archivo contiene caracteres no permitidos: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>No se pudo renombrar el archivo. Por favor, aseg?rate de estar conectado al servidor.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>No se puede renombrar el archivo porque ya existe un archivo con el mismo nombre en el servidor. Por favor, elige otro nombre.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>No se pudo renombrar el archivo local. %1</translation>
</message>
@@ -3378,16 +3470,6 @@
<translation><p>Una nueva versi?n del Cliente %1 est? disponible.</p><p><b>%2</b> est? disponible para descargar. La versi?n instalada es la %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Omitir esta vez</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Obtener la actualizaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>Actualizaci?n fallida</translation>
@@ -3412,6 +3494,16 @@
<source>Update manually</source>
<translation>Actualizar manualmente</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Omitir esta vez</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Obtener la actualizaci?n</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3436,6 +3528,23 @@
<translation>El servidor Proxy requiere de autenticaci?n</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Ancho de banda para Descarga</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Limitar a</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>Nota: la configuraci?n del proxy no tiene efectos para las cuentas en localhost</translation>
@@ -3458,46 +3567,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Ancho de banda para Descarga</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Sin l?mite</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Limitar a</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Limitar a 3/4 del ancho de banda estimado</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Ancho de banda para Carga</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Limitar autom?ticamente</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Ancho de banda para Carga</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Nombre del servidor proxy</translation>
@@ -3526,6 +3618,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>No fue posible verificar nuevas actualizaciones.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Verificando el servidor de actualizaci?n...</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>Nueva actualizaci?n de %1 lista</translation>
@@ -3556,11 +3658,6 @@
<translation>No se pudo descargar la actualizaci?n. Por favor, abre %1 para descargar la actualizaci?n manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>No fue posible verificar nuevas actualizaciones.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>%1 nueva disponible. Por favor, abre <a href='%2'>%2</a> para descargar la actualizaci?n.</translation>
@@ -3571,16 +3668,21 @@
<translation>%1 nueva disponible. Por favor, abre %2 para descargar la actualizaci?n.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Verificando el servidor de actualizaci?n...</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Estado de la actualizaci?n desconocido. No se verific? si hab?a nuevas actualizaciones. </translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>No hay actualizaciones disponibles. Tu instalaci?n tiene la versi?n m?s reciente.</translation>
@@ -3756,11 +3858,6 @@
<translation><font color="green">Conectado exitosamente a %1: %2 versi?n %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>URL Inv?lido</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Hubo una falla al conectarse a %1 en %2: <br/>%3</translation>
@@ -3771,6 +3868,16 @@
<translation>Expir? el tiempo al tratar de conectarse a %1 en %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Acceso prohibido por el servidor. Para verificar que tengas el acceso correcto, <a href="%1">haz click aqu?</a> para acceder al servicio con tu navegador.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>URL Inv?lido</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Intentando conectarse a %1 en %2...</translation>
@@ -3781,11 +3888,6 @@
<translation>La solicitud autenticada al servidor fue redirigida a "%1". La URL es incorrecta, el servidor est? mal configurado.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Acceso prohibido por el servidor. Para verificar que tengas el acceso correcto, <a href="%1">haz click aqu?</a> para acceder al servicio con tu navegador.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>Hubo una respuesta no v?lida a una solicitud WebDAV autenticada</translation>
@@ -3997,62 +4099,34 @@
<translation>Los nombres de archivo que terminan con un punto no son compatibles en este sistema de archivos.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>El nombre de archivo contiene al menos un car?cter no v?lido</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4062,6 +4136,24 @@
<translation>El nombre de archivo contiene espacios al final.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4070,6 +4162,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>El nombre de archivo contiene espacios al inicio.</translation>
@@ -4160,64 +4262,74 @@
<translation>El servidor no inform? de %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>No se puede sincronizar debido a una hora de modificaci?n no v?lida</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>Error al eliminar el registro de archivo %1 de la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>Movido a un destino no v?lido, se est? restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorado debido a la lista negra de "elegir qu? sincronizar"</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>No se permite debido a que no tienes permiso para a?adir subcarpetas a esa carpeta</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>No se permite debido a que no tienes permiso para a?adir archivos en esa carpeta</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>No se permite subir este archivo porque es de solo lectura en el servidor, se est? restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>No se permite eliminar, se est? restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Error al leer la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>El servidor respondi? con un error al leer el directorio "%1": %2</translation>
</message>
@@ -4225,38 +4337,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>Error al actualizar los metadatos debido a una hora de modificaci?n no v?lida</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Error al actualizar los metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>El archivo est? siendo utilizado actualmente</translation>
</message>
@@ -4274,12 +4386,6 @@
<translation>No se puede descargar el archivo %1 porque falta informaci?n de cifrado.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>El archivo ha cambiado desde que fue descubierto</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4336,6 +4442,12 @@
<source>The file %1 is currently in use</source>
<translation>El archivo %1 est? siendo utilizado actualmente</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>El archivo ha cambiado desde que fue descubierto</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4353,39 +4465,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>no fue posible borrar el archivo %1, error: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>No se puede crear la carpeta %1 debido a un conflicto de nombres con un archivo o carpeta local.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>No se pudo crear la carpeta %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Error al actualizar los metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>El archivo %1 est? siendo utilizado actualmente</translation>
</message>
@@ -4398,14 +4510,14 @@
<translation>No fue posible eliminar %1 porque hay un conflicto con el nombre de archivo local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>No se pudo eliminar el registro de archivo %1 de la base de datos local</translation>
</message>
@@ -4413,49 +4525,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>El archivo %1 se descarg?, ?pero gener? un conflicto con un nombre de archivo local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Error al establecer el estado de PIN</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Error al actualizar los metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>El archivo %1 est? siendo utilizado actualmente</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>Error al propagar el cambio de nombre del directorio en la jerarqu?a</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Error al cambiar el nombre del archivo</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>No se pudo eliminar el registro de archivo %1 de la base de datos local</translation>
</message>
@@ -4512,39 +4624,39 @@
<translation>No se pudo cambiar el nombre de %1 a %2, error: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Error al actualizar los metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>El archivo %1 est? siendo utilizado actualmente</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>C?digo equivocado de HTTP regresado por el servidor. Se esperaba 201, pero se recibi? "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>No se pudo eliminar el registro de archivo %1 de la base de datos local</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Error al establecer el estado del PIN</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
@@ -4552,22 +4664,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>Error al cargar el archivo cifrado.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>El archivo %1 no puede ser cargado porque existe otro archivo con el mismo nombre, con diferencias en su uso de may?sculas / min?sculas</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>La carga de %1 excede la cuota de la carpeta</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4575,11 +4676,6 @@
<translation>El archivo %1 tiene una hora de modificaci?n no v?lida. No lo subas al servidor.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Archivo eliminado (comenzar la carga) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>El archivo local cambi? durante la sincronizaci?n. Se resumir?. </translation>
@@ -4609,6 +4705,22 @@
<source>The file %1 is currently in use</source>
<translation>El archivo %1 est? siendo utilizado actualmente</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>La carga de %1 excede la cuota de la carpeta</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>Error al cargar el archivo cifrado.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Archivo eliminado (comenzar la carga) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4857,6 +4969,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Compartir desde el men? contextual</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Te compart? algo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Opciones de uso compartido</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Enviar enlace privado por correo electr?nico...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Copiar la liga privada al portapapeles</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>Error al cifrar la carpeta en "%1"</translation>
@@ -4891,43 +5029,17 @@
<translation>La siguiente carpeta se cifr? correctamente: "%1"</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Compartir desde el men? contextual</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Seleccionar una nueva ubicaci?n...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Te compart? algo</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Opciones de uso compartido</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Actividad</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Copiar la liga privada al portapapeles</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Enviar enlace privado por correo electr?nico...</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>Dejar este uso compartido</translation>
@@ -4943,11 +5055,6 @@
<translation>No se permite volver a compartir esta carpeta</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Copiar enlace interno</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>Cifrar</translation>
@@ -4974,12 +5081,6 @@
<translation><numerusform>Expira en %1 minutos</numerusform><numerusform>Expira en %1 minutos</numerusform><numerusform>Expira en %1 minutos</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Abrir en el navegador</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Resolver conflicto...</translation>
@@ -5009,6 +5110,17 @@
<source>Delete</source>
<translation>Borrar</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Copiar enlace interno</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Abrir en el navegador</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5110,13 +5222,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Esta conexi?n NO es segura ya que no est? encriptado.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Versi?n del servidor: %1</translation>
@@ -5136,6 +5241,13 @@
<source>The connection is not secure</source>
<translation>La conexi?n no es segura</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Esta conexi?n NO es segura ya que no est? encriptado.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5228,6 +5340,32 @@
<translation>%1 (omitido por un error previo, intentando de nuevo en %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Solo tiene %1 disponible, se necesita de al menos %2 para iniciar</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>No fue posible abrir o crear la base de datos de sincronizaci?n local. Aseg?rate de que tengas permisos de escritura en la carpeta de sincronizaci?n.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Espacio en disco bajo: Las descargas que podr?an reducir el espacio por debajo de %1 se omitieron.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>No hay espacio disponible en el servidor para algunas cargas.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Conflicto no resuelto.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>No se pudo actualizar el archivo: %1</translation>
@@ -5248,22 +5386,6 @@
<translation>No se pudo establecer el registro del archivo en la base de datos local: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Conflicto no resuelto.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Solo tiene %1 disponible, se necesita de al menos %2 para iniciar</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>No fue posible abrir o crear la base de datos de sincronizaci?n local. Aseg?rate de que tengas permisos de escritura en la carpeta de sincronizaci?n.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Usando archivos virtuales con sufijo, pero el sufijo no est? establecido</translation>
@@ -5283,16 +5405,6 @@
<source>Cannot open the sync journal</source>
<translation>No se puede abrir el diario de sincronizaci?n</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Espacio en disco bajo: Las descargas que podr?an reducir el espacio por debajo de %1 se omitieron.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>No hay espacio disponible en el servidor para algunas cargas.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5303,7 +5415,7 @@
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5687,11 +5799,6 @@
<source>Less than a minute</source>
<translation>Menos de un minuto</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5699,20 +5806,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5727,6 +5824,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5869,6 +5981,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Por favor inicia sesi?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>No se han configurado carpetas para sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Desconectado de %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Versi?n del Servidor No Soportada</translation>
@@ -5889,31 +6016,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Desconectado de %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Desconectado de las cunetas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Cuenta %1 : %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Por favor inicia sesi?n</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>La sincronizaci?n de cuentas est? deshabilitada</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5935,11 +6037,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>No se han configurado carpetas para sincronizar</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Comprobando cambios en el remoto "%1"</translation>
@@ -5950,6 +6047,21 @@
<translation>Comprobando cambios en el local "%1"</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Desconectado de las cunetas:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Cuenta %1 : %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>La sincronizaci?n de cuentas est? deshabilitada</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5958,11 +6070,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>Carpeta &Local</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Nombre de usuario</translation>
@@ -5998,22 +6105,11 @@
<translation>Preguntar antes de sincronizar carpetas m?s grandes que</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Preguntar antes de sincronizar almacenamientos externos</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Elige qu? sincronizar</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Mantener datos locales</translation>
@@ -6028,6 +6124,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Borrar carpeta local y comenzar una sincronizaci?n limpia</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Elige qu? sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>Carpeta &Local</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6068,6 +6180,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>en el futuro</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1m</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>ahora</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Hace alg?n tiempo</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6108,57 +6265,12 @@
<source>Synced %1</source>
<translation>Sincronizado %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>en el futuro</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>ahora</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1m</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Hace alg?n tiempo</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6404,6 +6516,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>Abrir carpetas locales o de grupo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Abrir carpeta local</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Conectado</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>Desconectado</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>Abrir carpeta local "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>Abrir carpeta de grupo "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>Abrir %1 en el explorador de archivos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>Men? de carpetas de grupo y usuario local</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6593,16 +6748,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6617,6 +6762,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6850,16 +7005,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Preparando para sincronizar</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Preparando para sincronizar</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>La sincronizaci?n est? pausada</translation>
@@ -6918,4 +7073,17 @@
<translation>Liberar espacio local</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_es_GT.ts nextcloud-desktop-3.16.6/translations/client_es_GT.ts
--- nextcloud-desktop-3.16.4/translations/client_es_GT.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_es_GT.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
@@ -570,7 +562,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Las carpetas no marcadas ser?n <b>eliminadas</b> de tu sistema de archivos local y ya no ser?n sincronizados a esta computadora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Cancelar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Aplicar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Conectado con <server> como <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Sincronizar todo</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Aplicar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Cancelar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Conectado con <server> como <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>No hay cuentas configuradas.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation type="unfinished"/>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>No hay cuentas configuradas.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation type="unfinished"/>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -730,12 +738,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Abrir carpeta</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -774,16 +776,6 @@
<translation>Reiniciar sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Reanudar sincronizaci?n</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Pausar sincronizaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Eliminar la conexi?n de sincronizaci?n de carpetas</translation>
@@ -809,21 +801,11 @@
<translation>Fall? la creaci?n de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar la Eliminaci?n de la Conexi?n de Sincronizaci?n de Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>?Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrar? ning?n archivo.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar la Conexi?n de Sincronizaci?n de la Carpeta</translation>
@@ -853,23 +835,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -883,33 +865,43 @@
<translation>La operaci?n de sincronizaci?n est? en curso. <br/>?Deseas terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes l?mites</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 de %2 en uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Actualmente no hay informaci?n disponible del espacio usado.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 en uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
@@ -928,80 +920,126 @@
<translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Cerraste sesi?n en %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Abrir carpeta</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Reanudar sincronizaci?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Pausar sincronizaci?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>?Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrar? ning?n archivo.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>No hay %1 conexi?n configurada. </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes l?mites</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Actualmente no hay informaci?n disponible del espacio usado.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>No hay %1 conexi?n configurada. </translation>
+ </message>
</context>
<context>
<name>OCC::AccountSetupFromCommandLineJob</name>
@@ -1115,11 +1153,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation type="unfinished"/>
@@ -1130,6 +1163,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Seleccionar un certificado</translation>
@@ -1180,46 +1218,46 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Error al acceder el archivo de configuraci?n</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation type="unfinished"/>
</message>
@@ -1261,6 +1299,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1268,6 +1345,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
@@ -1472,7 +1554,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir metadatos a la base de datos</translation>
</message>
@@ -1602,21 +1684,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1630,28 +1697,28 @@
%1</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Error de autenticaci?n: El usuario o contrase?a est?n equivocados. </translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="183"/>
- <source>Timeout</source>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Las credenciales proporcionadas no son correctas</translation>
+ <location filename="../src/gui/connectionvalidator.cpp" line="183"/>
+ <source>Timeout</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
@@ -1663,16 +1730,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor actualiza a la versi?n m?s reciente del servidor y reinicia el cliente.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Error de autenticaci?n: El usuario o contrase?a est?n equivocados. </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Las credenciales proporcionadas no son correctas</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation type="unfinished"/>
</message>
@@ -1680,19 +1762,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1700,27 +1782,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1959,11 +2041,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
@@ -1975,15 +2052,14 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
- <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
+ <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
<message>
@@ -1993,10 +2069,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2039,6 +2121,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ha sido eliminado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ha sido actualizado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 ha sido renombrado a %2. </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 se ha movido a %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2054,17 +2164,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ha sido eliminado.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -2080,33 +2179,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ha sido actualizado.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 ha sido renombrado a %2. </translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 se ha movido a %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2143,67 +2225,67 @@
<translation>Sincronizar Actividad</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>No fue posible leer el archivo de exclusi?n del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una nueva carpeta de m?s de %1 MB ha sido agregada: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una carpeta de un almacenamiento externo ha sido agregada.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2212,41 +2294,41 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2287,11 +2369,6 @@
<translation>No fue posible restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(respaldo)</translation>
@@ -2302,6 +2379,11 @@
<translation>(respaldo %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation type="unfinished"/>
@@ -2372,16 +2454,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>La sincronizaci?n est? pausada.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (La sincronizaci?n est? pausada)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2428,6 +2500,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>La sincronizaci?n est? pausada.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (La sincronizaci?n est? pausada)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2471,16 +2553,6 @@
<translation>Se present? un error al cargar la lista de carpetas desde el servidor. </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Hay conflictos sin resolver. Haz click para m?s detalles. </translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation type="unfinished"/>
@@ -2522,15 +2594,30 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Hay conflictos sin resolver. Haz click para m?s detalles. </translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2578,21 +2665,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 de %2, archivo %3 de %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2752,11 +2834,6 @@
<translation>Configuraciones generales</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Lanzar al Iniciar el Sistema</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation type="unfinished"/>
@@ -2767,11 +2844,6 @@
<translation>Para la Bandeja del Sistema</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Usar ?conos &Monocrom?ticos</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2787,17 +2859,32 @@
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Perdir confirmaci?p?n antes de sincronizar almacenamientos externos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Lanzar al Iniciar el Sistema</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Usar ?conos &Monocrom?ticos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2808,11 +2895,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Perdir confirmaci?p?n antes de sincronizar almacenamientos externos</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2864,11 +2946,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Reinicia && Actualiza</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation type="unfinished"/>
@@ -2889,6 +2966,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Reinicia && Actualiza</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
@@ -2909,6 +2996,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation type="unfinished"/>
@@ -2983,6 +3075,11 @@
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3143,102 +3240,97 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation type="unfinished"/>
</message>
@@ -3359,16 +3451,6 @@
<translation><p>Una nueva versi?n del Cliente %1 est? disponible.</p><p><b>%2</b> est? disponible para descargar. La versi?n instalada es la %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Omitir esta vez</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Obtener la actualizaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation type="unfinished"/>
@@ -3393,6 +3475,16 @@
<source>Update manually</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Omitir esta vez</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Obtener la actualizaci?n</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3417,6 +3509,23 @@
<translation>El servidor Proxy requiere de autenticaci?n</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Ancho de banda para Descarga</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Limitar a</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation type="unfinished"/>
@@ -3439,46 +3548,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Ancho de banda para Descarga</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Sin l?mite</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Limitar a</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Limitar a 3/4 del ancho de banda estimado</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Ancho de banda para Carga</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Limitar autom?ticamente</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Ancho de banda para Carga</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Nombre del servidor proxy</translation>
@@ -3507,6 +3599,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>No fue posible verificar nuevas actualizaciones.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation type="unfinished"/>
@@ -3537,11 +3639,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>No fue posible verificar nuevas actualizaciones.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation type="unfinished"/>
@@ -3552,14 +3649,19 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation>Estado de la actualizaci?n desconocido. No se verific? si hab?a nuevas actualizaciones. </translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
- <source>Update status is unknown: Did not check for new updates.</source>
- <translation>Estado de la actualizaci?n desconocido. No se verific? si hab?a nuevas actualizaciones. </translation>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
@@ -3737,11 +3839,6 @@
<translation><font color="green">Conectado exitosamente a %1: %2 versi?n %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>URL Inv?lido</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Hubo una falla al conectarse a %1 en %2: <br/>%3</translation>
@@ -3752,6 +3849,16 @@
<translation>Expir? el tiempo al tratar de conectarse a %1 en %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Acceso prohibido por el servidor. Para verificar que tengas el acceso correcto, <a href="%1">haz click aqu?</a> para acceder al servicio con tu navegador.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>URL Inv?lido</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation type="unfinished"/>
@@ -3762,11 +3869,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Acceso prohibido por el servidor. Para verificar que tengas el acceso correcto, <a href="%1">haz click aqu?</a> para acceder al servicio con tu navegador.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation type="unfinished"/>
@@ -3972,68 +4074,58 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
+ <source>File names containing the character "%1" are not supported on this file system.</source>
+ <comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
- <source>File names containing the character "%1" are not supported on this file system.</source>
- <comment>%1: the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
+ <source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
+ <source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>Folder name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
+ <source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
+ <source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
- <source>File name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="433"/>
+ <source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
- <source>Folder name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
- <source>File name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="433"/>
- <source>Filename contains trailing spaces.</source>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
@@ -4045,6 +4137,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
@@ -4135,64 +4237,74 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation type="unfinished"/>
</message>
@@ -4200,38 +4312,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4249,12 +4361,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>El archivo ha cambiado desde que fue descubierto</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4311,6 +4417,12 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>El archivo ha cambiado desde que fue descubierto</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4328,39 +4440,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>no fue posible borrar el archivo %1, error: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4373,14 +4485,14 @@
<translation>No fue posible eliminar %1 porque hay un conflicto con el nombre de archivo local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4388,49 +4500,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4487,39 +4599,39 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>C?digo equivocado de HTTP regresado por el servidor. Se esperaba 201, pero se recibi? "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
@@ -4527,22 +4639,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>El archivo %1 no puede ser cargado porque existe otro archivo con el mismo nombre, con diferencias en su uso de may?sculas / min?sculas</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>La carga de %1 excede la cuota de la carpeta</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4550,11 +4651,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>El archivo local cambi? durante la sincronizaci?n. Se resumir?. </translation>
@@ -4584,6 +4680,22 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>La carga de %1 excede la cuota de la carpeta</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4832,6 +4944,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Te compart? algo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Copiar la liga privada al portapapeles</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4864,43 +5002,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Te compart? algo</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Copiar la liga privada al portapapeles</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4916,11 +5028,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -4947,12 +5054,6 @@
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation type="unfinished"/>
@@ -4982,6 +5083,17 @@
<source>Delete</source>
<translation>Borrar</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5083,13 +5195,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Esta conexi?n NO es segura ya que no est? encriptado.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation type="unfinished"/>
@@ -5109,6 +5214,13 @@
<source>The connection is not secure</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Esta conexi?n NO es segura ya que no est? encriptado.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5201,6 +5313,32 @@
<translation>%1 (omitido por un error previo, intentando de nuevo en %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Solo tiene %1 disponible, se necesita de al menos %2 para iniciar</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>No fue posible abrir o crear la base de datos de sincronizaci?n local. Aseg?rate de que tengas permisos de escritura en la carpeta de sincronizaci?n.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Espacio en disco bajo: Las descargas que podr?an reducir el espacio por debajo de %1 se omitieron.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>No hay espacio disponible en el servidor para algunas cargas.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Conflicto no resuelto.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation type="unfinished"/>
@@ -5221,22 +5359,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Conflicto no resuelto.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Solo tiene %1 disponible, se necesita de al menos %2 para iniciar</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>No fue posible abrir o crear la base de datos de sincronizaci?n local. Aseg?rate de que tengas permisos de escritura en la carpeta de sincronizaci?n.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
@@ -5256,16 +5378,6 @@
<source>Cannot open the sync journal</source>
<translation>No se puede abrir el diario de sincronizaci?n</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Espacio en disco bajo: Las descargas que podr?an reducir el espacio por debajo de %1 se omitieron.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>No hay espacio disponible en el servidor para algunas cargas.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5276,7 +5388,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5660,11 +5772,6 @@
<source>Less than a minute</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5672,20 +5779,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5700,6 +5797,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5842,6 +5954,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Por favor inicia sesi?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>No se han configurado carpetas para sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Desconectado de %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Versi?n del Servidor No Soportada</translation>
@@ -5862,31 +5989,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Desconectado de %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Desconectado de las cunetas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Cuenta %1 : %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Por favor inicia sesi?n</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>La sincronizaci?n de cuentas est? deshabilitada</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5908,11 +6010,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>No se han configurado carpetas para sincronizar</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation type="unfinished"/>
@@ -5923,6 +6020,21 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Desconectado de las cunetas:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Cuenta %1 : %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>La sincronizaci?n de cuentas est? deshabilitada</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5931,11 +6043,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>Carpeta &Local</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation type="unfinished"/>
@@ -5971,22 +6078,11 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Elige qu? sincronizar</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation type="unfinished"/>
@@ -6001,6 +6097,22 @@
<source>Erase local folder and start a clean sync</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Elige qu? sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>Carpeta &Local</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6041,6 +6153,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>en el futuro</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>ahora</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Hace alg?n tiempo</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6081,57 +6238,12 @@
<source>Synced %1</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>en el futuro</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>ahora</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Hace alg?n tiempo</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6377,6 +6489,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6566,16 +6721,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6590,6 +6735,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6823,16 +6978,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Preparando para sincronizar</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Preparando para sincronizar</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>La sincronizaci?n est? pausada</translation>
@@ -6891,4 +7046,17 @@
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_es_HN.ts nextcloud-desktop-3.16.6/translations/client_es_HN.ts
--- nextcloud-desktop-3.16.4/translations/client_es_HN.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_es_HN.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
@@ -570,7 +562,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Las carpetas no marcadas ser?n <b>eliminadas</b> de tu sistema de archivos local y ya no ser?n sincronizados a esta computadora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Cancelar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Aplicar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Conectado con <server> como <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Sincronizar todo</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Aplicar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Cancelar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Conectado con <server> como <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>No hay cuentas configuradas.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation type="unfinished"/>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>No hay cuentas configuradas.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation type="unfinished"/>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -730,12 +738,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Abrir carpeta</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -774,16 +776,6 @@
<translation>Reiniciar sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Reanudar sincronizaci?n</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Pausar sincronizaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Eliminar la conexi?n de sincronizaci?n de carpetas</translation>
@@ -809,21 +801,11 @@
<translation>Fall? la creaci?n de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar la Eliminaci?n de la Conexi?n de Sincronizaci?n de Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>?Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrar? ning?n archivo.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar la Conexi?n de Sincronizaci?n de la Carpeta</translation>
@@ -853,23 +835,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -883,33 +865,43 @@
<translation>La operaci?n de sincronizaci?n est? en curso. <br/>?Deseas terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes l?mites</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 de %2 en uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Actualmente no hay informaci?n disponible del espacio usado.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 en uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
@@ -928,80 +920,126 @@
<translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Cerraste sesi?n en %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Abrir carpeta</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Reanudar sincronizaci?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Pausar sincronizaci?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>?Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrar? ning?n archivo.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>No hay %1 conexi?n configurada. </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes l?mites</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Actualmente no hay informaci?n disponible del espacio usado.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>No hay %1 conexi?n configurada. </translation>
+ </message>
</context>
<context>
<name>OCC::AccountSetupFromCommandLineJob</name>
@@ -1115,11 +1153,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation type="unfinished"/>
@@ -1130,6 +1163,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Seleccionar un certificado</translation>
@@ -1180,46 +1218,46 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Error al acceder el archivo de configuraci?n</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation type="unfinished"/>
</message>
@@ -1261,6 +1299,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1268,6 +1345,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
@@ -1472,7 +1554,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir metadatos a la base de datos</translation>
</message>
@@ -1602,21 +1684,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1630,28 +1697,28 @@
%1</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Error de autenticaci?n: El usuario o contrase?a est?n equivocados. </translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="183"/>
- <source>Timeout</source>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Las credenciales proporcionadas no son correctas</translation>
+ <location filename="../src/gui/connectionvalidator.cpp" line="183"/>
+ <source>Timeout</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
@@ -1663,16 +1730,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor actualiza a la versi?n m?s reciente del servidor y reinicia el cliente.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Error de autenticaci?n: El usuario o contrase?a est?n equivocados. </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Las credenciales proporcionadas no son correctas</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation type="unfinished"/>
</message>
@@ -1680,19 +1762,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1700,27 +1782,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1959,11 +2041,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
@@ -1975,15 +2052,14 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
- <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
+ <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
<message>
@@ -1993,10 +2069,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2039,6 +2121,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ha sido eliminado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ha sido actualizado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 ha sido renombrado a %2. </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 se ha movido a %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2054,17 +2164,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ha sido eliminado.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -2080,33 +2179,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ha sido actualizado.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 ha sido renombrado a %2. </translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 se ha movido a %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2143,67 +2225,67 @@
<translation>Sincronizar Actividad</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>No fue posible leer el archivo de exclusi?n del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una nueva carpeta de m?s de %1 MB ha sido agregada: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una carpeta de un almacenamiento externo ha sido agregada.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2212,41 +2294,41 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2287,11 +2369,6 @@
<translation>No fue posible restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(respaldo)</translation>
@@ -2302,6 +2379,11 @@
<translation>(respaldo %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation type="unfinished"/>
@@ -2372,16 +2454,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>La sincronizaci?n est? pausada.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (La sincronizaci?n est? pausada)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2428,6 +2500,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>La sincronizaci?n est? pausada.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (La sincronizaci?n est? pausada)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2471,16 +2553,6 @@
<translation>Se present? un error al cargar la lista de carpetas desde el servidor. </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Hay conflictos sin resolver. Haz click para m?s detalles. </translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation type="unfinished"/>
@@ -2522,15 +2594,30 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Hay conflictos sin resolver. Haz click para m?s detalles. </translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2578,21 +2665,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 de %2, archivo %3 de %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2752,11 +2834,6 @@
<translation>Configuraciones generales</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Lanzar al Iniciar el Sistema</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation type="unfinished"/>
@@ -2767,11 +2844,6 @@
<translation>Para la Bandeja del Sistema</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Usar ?conos &Monocrom?ticos</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2787,17 +2859,32 @@
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Perdir confirmaci?p?n antes de sincronizar almacenamientos externos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Lanzar al Iniciar el Sistema</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Usar ?conos &Monocrom?ticos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2808,11 +2895,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Perdir confirmaci?p?n antes de sincronizar almacenamientos externos</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2864,11 +2946,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Reinicia && Actualiza</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation type="unfinished"/>
@@ -2889,6 +2966,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Reinicia && Actualiza</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
@@ -2909,6 +2996,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation type="unfinished"/>
@@ -2983,6 +3075,11 @@
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3143,102 +3240,97 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation type="unfinished"/>
</message>
@@ -3359,16 +3451,6 @@
<translation><p>Una nueva versi?n del Cliente %1 est? disponible.</p><p><b>%2</b> est? disponible para descargar. La versi?n instalada es la %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Omitir esta vez</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Obtener la actualizaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation type="unfinished"/>
@@ -3393,6 +3475,16 @@
<source>Update manually</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Omitir esta vez</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Obtener la actualizaci?n</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3417,6 +3509,23 @@
<translation>El servidor Proxy requiere de autenticaci?n</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Ancho de banda para Descarga</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Limitar a</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation type="unfinished"/>
@@ -3439,46 +3548,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Ancho de banda para Descarga</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Sin l?mite</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Limitar a</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Limitar a 3/4 del ancho de banda estimado</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Ancho de banda para Carga</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Limitar autom?ticamente</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Ancho de banda para Carga</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Nombre del servidor proxy</translation>
@@ -3507,6 +3599,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>No fue posible verificar nuevas actualizaciones.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation type="unfinished"/>
@@ -3537,11 +3639,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>No fue posible verificar nuevas actualizaciones.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation type="unfinished"/>
@@ -3552,14 +3649,19 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation>Estado de la actualizaci?n desconocido. No se verific? si hab?a nuevas actualizaciones. </translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
- <source>Update status is unknown: Did not check for new updates.</source>
- <translation>Estado de la actualizaci?n desconocido. No se verific? si hab?a nuevas actualizaciones. </translation>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
@@ -3737,11 +3839,6 @@
<translation><font color="green">Conectado exitosamente a %1: %2 versi?n %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>URL Inv?lido</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Hubo una falla al conectarse a %1 en %2: <br/>%3</translation>
@@ -3752,6 +3849,16 @@
<translation>Expir? el tiempo al tratar de conectarse a %1 en %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Acceso prohibido por el servidor. Para verificar que tengas el acceso correcto, <a href="%1">haz click aqu?</a> para acceder al servicio con tu navegador.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>URL Inv?lido</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation type="unfinished"/>
@@ -3762,11 +3869,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Acceso prohibido por el servidor. Para verificar que tengas el acceso correcto, <a href="%1">haz click aqu?</a> para acceder al servicio con tu navegador.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation type="unfinished"/>
@@ -3972,68 +4074,58 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
+ <source>File names containing the character "%1" are not supported on this file system.</source>
+ <comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
- <source>File names containing the character "%1" are not supported on this file system.</source>
- <comment>%1: the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
+ <source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
+ <source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>Folder name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
+ <source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
+ <source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
- <source>File name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="433"/>
+ <source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
- <source>Folder name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
- <source>File name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="433"/>
- <source>Filename contains trailing spaces.</source>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
@@ -4045,6 +4137,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
@@ -4135,64 +4237,74 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation type="unfinished"/>
</message>
@@ -4200,38 +4312,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4249,12 +4361,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>El archivo ha cambiado desde que fue descubierto</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4311,6 +4417,12 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>El archivo ha cambiado desde que fue descubierto</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4328,39 +4440,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>no fue posible borrar el archivo %1, error: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4373,14 +4485,14 @@
<translation>No fue posible eliminar %1 porque hay un conflicto con el nombre de archivo local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4388,49 +4500,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4487,39 +4599,39 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>C?digo equivocado de HTTP regresado por el servidor. Se esperaba 201, pero se recibi? "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
@@ -4527,22 +4639,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>El archivo %1 no puede ser cargado porque existe otro archivo con el mismo nombre, con diferencias en su uso de may?sculas / min?sculas</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>La carga de %1 excede la cuota de la carpeta</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4550,11 +4651,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>El archivo local cambi? durante la sincronizaci?n. Se resumir?. </translation>
@@ -4584,6 +4680,22 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>La carga de %1 excede la cuota de la carpeta</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4832,6 +4944,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Te compart? algo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Copiar la liga privada al portapapeles</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4864,43 +5002,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Te compart? algo</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Copiar la liga privada al portapapeles</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4916,11 +5028,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -4947,12 +5054,6 @@
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation type="unfinished"/>
@@ -4982,6 +5083,17 @@
<source>Delete</source>
<translation>Borrar</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5083,13 +5195,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Esta conexi?n NO es segura ya que no est? encriptado.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation type="unfinished"/>
@@ -5109,6 +5214,13 @@
<source>The connection is not secure</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Esta conexi?n NO es segura ya que no est? encriptado.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5201,6 +5313,32 @@
<translation>%1 (omitido por un error previo, intentando de nuevo en %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Solo tiene %1 disponible, se necesita de al menos %2 para iniciar</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>No fue posible abrir o crear la base de datos de sincronizaci?n local. Aseg?rate de que tengas permisos de escritura en la carpeta de sincronizaci?n.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Espacio en disco bajo: Las descargas que podr?an reducir el espacio por debajo de %1 se omitieron.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>No hay espacio disponible en el servidor para algunas cargas.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Conflicto no resuelto.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation type="unfinished"/>
@@ -5221,22 +5359,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Conflicto no resuelto.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Solo tiene %1 disponible, se necesita de al menos %2 para iniciar</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>No fue posible abrir o crear la base de datos de sincronizaci?n local. Aseg?rate de que tengas permisos de escritura en la carpeta de sincronizaci?n.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
@@ -5256,16 +5378,6 @@
<source>Cannot open the sync journal</source>
<translation>No se puede abrir el diario de sincronizaci?n</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Espacio en disco bajo: Las descargas que podr?an reducir el espacio por debajo de %1 se omitieron.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>No hay espacio disponible en el servidor para algunas cargas.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5276,7 +5388,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5660,11 +5772,6 @@
<source>Less than a minute</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5672,20 +5779,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5700,6 +5797,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5842,6 +5954,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Por favor inicia sesi?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>No se han configurado carpetas para sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Desconectado de %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Versi?n del Servidor No Soportada</translation>
@@ -5862,31 +5989,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Desconectado de %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Desconectado de las cunetas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Cuenta %1 : %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Por favor inicia sesi?n</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>La sincronizaci?n de cuentas est? deshabilitada</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5908,11 +6010,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>No se han configurado carpetas para sincronizar</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation type="unfinished"/>
@@ -5923,6 +6020,21 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Desconectado de las cunetas:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Cuenta %1 : %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>La sincronizaci?n de cuentas est? deshabilitada</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5931,11 +6043,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>Carpeta &Local</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation type="unfinished"/>
@@ -5971,22 +6078,11 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Elige qu? sincronizar</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation type="unfinished"/>
@@ -6001,6 +6097,22 @@
<source>Erase local folder and start a clean sync</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Elige qu? sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>Carpeta &Local</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6041,6 +6153,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>en el futuro</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>ahora</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Hace alg?n tiempo</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6081,57 +6238,12 @@
<source>Synced %1</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>en el futuro</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>ahora</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Hace alg?n tiempo</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6377,6 +6489,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6566,16 +6721,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6590,6 +6735,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6823,16 +6978,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Preparando para sincronizar</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Preparando para sincronizar</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>La sincronizaci?n est? pausada</translation>
@@ -6891,4 +7046,17 @@
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_es_MX.ts nextcloud-desktop-3.16.6/translations/client_es_MX.ts
--- nextcloud-desktop-3.16.4/translations/client_es_MX.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_es_MX.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>Habilitar sincronizaci?n r?pida</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>La sincronizaci?n r?pida s?lo sincronizar? los cambios en archivos y carpetas dentro de las carpetas que se han explorado. Esto puede incrementar significativamente la capacidad de respuesta en la configuraci?n inicial de archivos virtuales. Sin embargo, esto provocar? descargas redundantes de archivos movidos a carpetas inexploradas.</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>Activar archivos virtuales</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -557,7 +549,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Importaci?n antigua</translation>
</message>
@@ -572,7 +564,7 @@
<translation>Omitir</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>No se pudieron importar las cuentas desde la configuraci?n del cliente antiguo.</translation>
</message>
@@ -580,33 +572,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Espacio de almacenamiento: ?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Las carpetas no marcadas ser?n <b>eliminadas</b> de tu sistema de archivos local y ya no ser?n sincronizados a esta computadora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Cancelar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Aplicar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Conectado con <server> como <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Sincronizar todo</translation>
@@ -637,6 +607,33 @@
<translation>Configuraci?n de la conexi?n</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Aplicar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Espacio de almacenamiento: ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Cancelar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Conectado con <server> como <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>No hay cuentas configuradas.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>Cifrado punto a punto con archivos virtuales</translation>
@@ -671,9 +668,9 @@
<b>Este proceso no es reversible. ?Seguro que desea continuar?</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>No hay cuentas configuradas.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -686,6 +683,11 @@
<translation>Mostrar mnemot?cnica</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>El cifrado punto a punto ha sido habilitado para esta cuenta</translation>
@@ -711,6 +713,12 @@
<translation>La carpeta tiene un problema de sincronizaci?n. El cifrado de esta carpeta ser? posible cuando se haya sincronizado correctamente.</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -735,12 +743,6 @@
<translation>No se pudo cifrar la carpeta porque ya no existe</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Abrir carpeta</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Cifrar</translation>
@@ -779,16 +781,6 @@
<translation>Reiniciar sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Reanudar sincronizaci?n</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Pausar sincronizaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Eliminar la conexi?n de sincronizaci?n de carpetas</translation>
@@ -814,21 +806,11 @@
<translation>Fall? la creaci?n de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>No se pudo crear la carpeta local <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar la Eliminaci?n de la Conexi?n de Sincronizaci?n de Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>?Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrar? ning?n archivo.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar la Conexi?n de Sincronizaci?n de la Carpeta</translation>
@@ -862,24 +844,24 @@
<translation>Mnemot?cnico de cifrado punto a punto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>Para proteger su identidad criptogr?fica, la ciframos con un mnemot?cnico de 12 palabras del diccionario. Por favor, an?telas y gu?rdelas en un lugar seguro. Las necesitar? para agregar otros dispositivos a su cuenta (como su tel?fono m?vil o computadora port?til).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>Deshabilitar el cifrado punto a punto</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>?Deshabilitar el cifrado punto a punto para %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>Eliminar el cifrado punto a punto eliminar? los archivos cifrados que est?n sincronizados localmente.<br>Los archivos cifrados permanecer?n en el servidor.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -892,34 +874,44 @@
<translation>La operaci?n de sincronizaci?n est? en curso. <br/>?Deseas terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes l?mites</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 de %2 en uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Actualmente no hay informaci?n disponible del espacio usado.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>Existen carpetas que han aumentado de tama?o m?s all? de %1MB: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 en uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 como %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>Se ha habilitado el cifrado punto a punto en esta cuenta con otro dispositivo.<br>Se puede habilitar en este dispositivo ingresando su mnemot?cnico.<br>Esto permitir? la sincronizaci?n de carpetas cifradas existentes.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>?La versi?n del servidor %1 no est? soportada! Proceda bajo su propio riesgo.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Configurar cifrado</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Esta cuenta soporta el cifrado punto a punto</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -937,79 +929,125 @@
<translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>El servidor %1 est? siendo redirigido o su conexi?n est? detr?s de un portal cautivo.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Cerraste sesi?n en %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Conectando a %1 ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>No se pudo conectar a %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Error de configuraci?n del servidor: %1 en %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Abrir carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>No hay %1 conexi?n configurada. </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Reanudar sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Pausar sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>No se pudo crear la carpeta local <i>%1</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>?Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrar? ning?n archivo.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>Para proteger su identidad criptogr?fica, la ciframos con un mnemot?cnico de 12 palabras del diccionario. Por favor, an?telas y gu?rdelas en un lugar seguro. Las necesitar? para agregar otros dispositivos a su cuenta (como su tel?fono m?vil o computadora port?til).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>Existen carpetas que han aumentado de tama?o m?s all? de %1MB: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>Deshabilitar el cifrado punto a punto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>Se ha habilitado el cifrado punto a punto en esta cuenta con otro dispositivo.<br>Se puede habilitar en este dispositivo ingresando su mnemot?cnico.<br>Esto permitir? la sincronizaci?n de carpetas cifradas existentes.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>?Deshabilitar el cifrado punto a punto para %1?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Esta cuenta soporta el cifrado punto a punto</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>Eliminar el cifrado punto a punto eliminar? los archivos cifrados que est?n sincronizados localmente.<br>Los archivos cifrados permanecer?n en el servidor.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Configurar cifrado</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes l?mites</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 de %2 en uso</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Actualmente no hay informaci?n disponible del espacio usado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 como %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>?La versi?n del servidor %1 no est? soportada! Proceda bajo su propio riesgo.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>El servidor %1 est? siendo redirigido o su conexi?n est? detr?s de un portal cautivo.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Conectando a %1 ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>No se pudo conectar a %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Error de configuraci?n del servidor: %1 en %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>No hay %1 conexi?n configurada. </translation>
</message>
</context>
<context>
@@ -1124,11 +1162,6 @@
<translation>Certificado y llave (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Navegar ?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Contrase?a del certificado:</translation>
@@ -1139,6 +1172,11 @@
<translation>Es altamente recomendado un paquete de cifrado pkcs12 dado que una copia se guardar? en el archivo de configuraci?n.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Navegar ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Seleccionar un certificado</translation>
@@ -1189,34 +1227,34 @@
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 cuentas</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 cuenta</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 carpetas</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 carpeta</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Importaci?n antigua</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1224,12 +1262,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Error al acceder el archivo de configuraci?n</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>Ocurri? un error al acceder al archivo de configuraci?n en %1. Por favor, revise que su cuenta de sistema pueda acceder al archivo.</translation>
</message>
@@ -1271,6 +1309,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1278,6 +1355,11 @@
<translation>No se puede cargar el archivo %1 porque ya existe otro archivo con el mismo nombre, con diferencias ?nicamente en may?sculas y min?sculas</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>El archivo %1 tiene una hora de modificaci?n inv?lida. No se debe cargar en el servidor.</translation>
@@ -1482,7 +1564,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir metadatos a la base de datos</translation>
</message>
@@ -1612,21 +1694,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>?Deseas eliminar el directorio <i>%1</i> y todo su contenido permanentemente?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>?Desea eliminar el archivo <i>%1</i> permanentemente?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Confirmar eliminaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1642,30 +1709,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>No se ha configurado una cuenta de Nextcloud</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>?Deseas eliminar el directorio <i>%1</i> y todo su contenido permanentemente?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Error de autenticaci?n: El usuario o contrase?a est?n equivocados. </translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>?Desea eliminar el archivo <i>%1</i> permanentemente?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Confirmar eliminaci?n</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Tiempo de espera</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Las credenciales proporcionadas no son correctas</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>El servidor configurado para este cliente es demasiado antiguo</translation>
@@ -1675,16 +1742,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor actualiza a la versi?n m?s reciente del servidor y reinicia el cliente.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Error de autenticaci?n: El usuario o contrase?a est?n equivocados. </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>No se ha configurado una cuenta de Nextcloud</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Las credenciales proporcionadas no son correctas</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Error al cancelar la eliminaci?n de un archivo</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>Error al cancelar la eliminaci?n de %1</translation>
</message>
@@ -1692,19 +1774,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Error del servidor: ?La respuesta PROPFIND no tiene formato XML!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>?Hubo un error al configurar los metadatos cifrados!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1712,27 +1794,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Error al abrir el directorio %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Directorio no accesible en el cliente, permiso denegado</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Directorio no encontrado: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>La codificaci?n del nombre de archivo es inv?lida</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Error al leer el directorio %1</translation>
</message>
@@ -1972,11 +2054,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>La URL de votaci?n no comienza con HTTPS a pesar de que la URL de inicio de sesi?n s? comenz? con HTTPS. El inicio de sesi?n no es posible porque esto podr?a ser un problema de seguridad. Por favor, contacte a su administrador.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>La URL del servidor devuelta no comienza con HTTPS a pesar de que la URL de inicio de sesi?n s? comenz? con HTTPS. El inicio de sesi?n es posible porque esto podr?a ser un problema de seguridad. Por favor, contacte a su administrador.</translation>
@@ -1988,28 +2065,33 @@
<translation>Error devuelto por el servidor: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>La URL de votaci?n no comienza con HTTPS a pesar de que la URL de inicio de sesi?n s? comenz? con HTTPS. El inicio de sesi?n no es posible porque esto podr?a ser un problema de seguridad. Por favor, contacte a su administrador.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Hubo un error al acceder al punto final del "token": <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>No se pudo analizar gram?ticamente el JSON devuelto por el servidor: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>La respuesta del servidor no contiene todos los campos esperados</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>No se pudo analizar gram?ticamente el JSON devuelto por el servidor: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2052,6 +2134,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ha sido eliminado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ha sido actualizado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 ha sido renombrado a %2. </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 se ha movido a %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2067,17 +2177,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ha sido eliminado.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>Se han a?adido %1 y %n otro(s) archivo(s).</numerusform><numerusform>Se han a?adido %1 y %n otro(s) archivo(s).</numerusform><numerusform>Se han a?adido %1 y %n otro(s) archivo(s).</numerusform></translation>
@@ -2093,33 +2192,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ha sido actualizado.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 ha sido renombrado a %2. </translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 se ha movido a %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2156,68 +2238,68 @@
<translation>Sincronizar Actividad</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>No fue posible leer el archivo de exclusi?n del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una nueva carpeta de m?s de %1 MB ha sido agregada: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una carpeta de un almacenamiento externo ha sido agregada.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>Una carpeta ha sobrepasado el l?mite establecido de tama?o de %1MB: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>Continuar sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>Detener sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>La carpeta %1 ha sobrepasado el l?mite establecido de tama?o de %2MB.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>?Desea detener la sincronizaci?n de esta carpeta?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>La carpeta %1 fue creada pero fue excluida de la sincronizaci?n previamente. Los datos dentro de ella no se sincronizar?n.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>El archivo %1 fue creado pero fue excluido de la sincronizaci?n previamente. No se sincronizar?.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2230,41 +2312,41 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>La descarga del archivo virtual fall? con el c?digo "%1" , estado "%2" y mensaje de error "%3"</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>?Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2305,11 +2387,6 @@
<translation>No fue posible restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>Se encontr? un antiguo registro de sincronizaci?n "%1", pero no se pudo eliminar. Por favor, aseg?rese que ninguna aplicaci?n lo est? utilizando actualmente.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(respaldo)</translation>
@@ -2320,6 +2397,11 @@
<translation>(respaldo %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>Se encontr? un antiguo registro de sincronizaci?n "%1", pero no se pudo eliminar. Por favor, aseg?rese que ninguna aplicaci?n lo est? utilizando actualmente.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Estado indefinido.</translation>
@@ -2390,16 +2472,6 @@
<translation>La solicitud de sincronizaci?n fue cancelada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>La sincronizaci?n est? pausada.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (La sincronizaci?n est? pausada)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2446,6 +2518,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>La sincronizaci?n est? pausada.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (La sincronizaci?n est? pausada)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2489,16 +2571,6 @@
<translation>Se present? un error al cargar la lista de carpetas desde el servidor. </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Obteniendo la lista de carpetas desde el servidor ...</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Hay conflictos sin resolver. Haz click para m?s detalles. </translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>El soporte de archivos virtuales est? habilitado.</translation>
@@ -2540,16 +2612,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>Descargando %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>Archivo %1 de %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Hay conflictos sin resolver. Haz click para m?s detalles. </translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>Descargando %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Obteniendo la lista de carpetas desde el servidor ...</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2596,21 +2683,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 de %2, archivo %3 de %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>Archivo %1 de %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>Esperando por %n carpeta(s) ...</numerusform><numerusform>Esperando por %n carpeta(s) ...</numerusform><numerusform>Esperando por %n carpeta(s) ...</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>A punto de comenzar la sincronizaci?n</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>Esperando por %n carpeta(s) ...</numerusform><numerusform>Esperando por %n carpeta(s) ...</numerusform><numerusform>Esperando por %n carpeta(s) ...</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2770,11 +2852,6 @@
<translation>Configuraciones generales</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Lanzar al Iniciar el Sistema</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>Mostrar notificaciones de llamadas</translation>
@@ -2785,11 +2862,6 @@
<translation>Para la Bandeja del Sistema</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Usar ?conos &Monocrom?ticos</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2805,17 +2877,32 @@
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Pedir confirmaci?n antes de sincronizar carpetas nuevas mayores a</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Perdir confirmaci?p?n antes de sincronizar almacenamientos externos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Lanzar al Iniciar el Sistema</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Usar ?conos &Monocrom?ticos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Pedir confirmaci?n antes de sincronizar carpetas nuevas mayores a</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>Notificar cuando las carpetas sincronizadas aumenten su tama?o m?s all? del l?mite especificado</translation>
@@ -2826,11 +2913,6 @@
<translation>Deshabilitar sincronizaci?n autom?ticamente para las carpetas que sobrepasen el l?mite</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Perdir confirmaci?p?n antes de sincronizar almacenamientos externos</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>Mover archivos eliminados a la papelera</translation>
@@ -2882,11 +2964,6 @@
<translation>Canal de actualizaciones</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Reinicia && Actualiza</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>Comprobar &actualizaciones autom?ticamente</translation>
@@ -2907,6 +2984,16 @@
<translation>Aviso legal</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Reinicia && Actualiza</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Notificaciones del servidor que requieren atenci?n.</translation>
@@ -2927,6 +3014,11 @@
<translation>No puede desactivar el inicio autom?tico porque el inicio autom?tico a nivel de sistema est? habilitado.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>estable</translation>
@@ -3001,6 +3093,11 @@
<source>Debug archive is created at %1</source>
<translation>Archivo de depuraci?n creado en %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3165,102 +3262,97 @@
<translation>Nuevo nombre de archivo</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Renombrar archivo</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>No se pudo sincronizar el archivo "%1" porque el nombre contiene caracteres que no est?n permitidos en este sistema.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>Los siguientes caracteres no est?n permitidos en el sistema: * " | & ? , ; : \ / ~ < > espacios al principio o al final</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Comprobando los permisos de renombramiento ...</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>No tiene permiso para renombrar este archivo. Por favor, solicite al autor del archivo que lo renombre.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>Error al obtener los permisos con el error %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>El nombre de archivo contiene espacios al principio y al final.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>El nombre de archivo contiene espacios al principio.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>El nombre de archivo contiene espacios al final.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>Usar nombre inv?lido</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>El nombre de archivo contiene caracteres no permitidos: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>No se pudo renombrar el archivo. Por favor, aseg?rese de estar conectado al servidor.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>No se puede renombrar el archivo porque ya hay un archivo con el mismo nombre en el servidor. Por favor, elija otro nombre.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>No se pudo renombrar el archivo local. %1</translation>
</message>
@@ -3384,16 +3476,6 @@
<translation><p>Una nueva versi?n del Cliente %1 est? disponible.</p><p><b>%2</b> est? disponible para descargar. La versi?n instalada es la %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Omitir esta vez</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Obtener la actualizaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>La actualizaci?n fall?</translation>
@@ -3418,6 +3500,16 @@
<source>Update manually</source>
<translation>Actualizar manualmente</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Omitir esta vez</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Obtener la actualizaci?n</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3442,6 +3534,23 @@
<translation>El servidor Proxy requiere de autenticaci?n</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Ancho de banda para Descarga</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Limitar a</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>Nota: la configuraci?n del proxy no tiene efecto para las cuentas en el sistema local</translation>
@@ -3464,46 +3573,29 @@
<translation>Usar la configuraci?n global</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Ancho de banda para Descarga</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Sin l?mite</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Limitar a</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Limitar a 3/4 del ancho de banda estimado</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Ancho de banda para Carga</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Limitar autom?ticamente</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Ancho de banda para Carga</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Nombre del servidor proxy</translation>
@@ -3532,6 +3624,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>No fue posible verificar nuevas actualizaciones.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Verificando el servidor de actualizaciones ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>La nueva actualizaci?n de %1 est? lista</translation>
@@ -3562,11 +3664,6 @@
<translation>No se pudo descargar la actualizaci?n. Por favor, abra %1 para descargar la actualizaci?n manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>No fue posible verificar nuevas actualizaciones.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>La nueva %1 est? disponible. Por favor, abra<a href='%2'>%2</a> para descargar la actualizaci?n.</translation>
@@ -3577,16 +3674,21 @@
<translation>La nueva %1 est? disponible. Por favor, abra %2 para descargar la actualizaci?n.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Verificando el servidor de actualizaciones ...</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Estado de la actualizaci?n desconocido. No se verific? si hab?a nuevas actualizaciones. </translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>No hay actualizaciones disponibles. Tu instalaci?n tiene la versi?n m?s reciente.</translation>
@@ -3762,11 +3864,6 @@
<translation><font color="green">Conectado exitosamente a %1: %2 versi?n %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>URL Inv?lido</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Hubo una falla al conectarse a %1 en %2: <br/>%3</translation>
@@ -3777,6 +3874,16 @@
<translation>Expir? el tiempo al tratar de conectarse a %1 en %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Acceso prohibido por el servidor. Para verificar que tengas el acceso correcto, <a href="%1">haz click aqu?</a> para acceder al servicio con tu navegador.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>URL Inv?lido</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Intentando conectar a %1 desde %2 ...</translation>
@@ -3787,11 +3894,6 @@
<translation>La solicitud autentificada al servidor fue redirigida a "%1". La URL es incorrecta, el servidor est? mal configurado.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Acceso prohibido por el servidor. Para verificar que tengas el acceso correcto, <a href="%1">haz click aqu?</a> para acceder al servicio con tu navegador.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>Hubo una respuesta inv?lida a una solicitud WebDAV autentificada</translation>
@@ -4003,62 +4105,34 @@
<translation>Los nombres de archivo con punto final no son compatibles en este sistema de archivos.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Carpeta</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Archivo</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>El nombre %1 que contiene el caracter "%2" no est? soportado en este sistema de archivos.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>El nombre %1 contiene al menos un caracter inv?lido</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>El nombre %1 es un nombre reservado en este sistema de archivos.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>El nombre de archivo contiene al menos un caracter inv?lido</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4068,6 +4142,24 @@
<translation>El nombre de archivo contiene espacios al final.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Carpeta</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Archivo</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>El nombre %1 que contiene el caracter "%2" no est? soportado en este sistema de archivos.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4076,6 +4168,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>El nombre %1 contiene al menos un caracter inv?lido</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>El nombre %1 es un nombre reservado en este sistema de archivos.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>El nombre de archivo contiene espacios al principio.</translation>
@@ -4166,64 +4268,74 @@
<translation>El servidor no inform? de %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>No se puede sincronizar debido a una hora de modificaci?n inv?lida</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>No se puede cargar el archivo, porque est? abierto en "%1".</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>Error al eliminar el registro de archivo %1 de la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>Movido a un destino inv?lido, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorado debido a la lista negra de "elegir qu? sincronizar"</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>No permitido porque no tiene permiso para a?adir subcarpetas a esa carpeta.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>No permitido porque no tiene permiso para a?adir archivos a esa carpeta.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>No est? permitido subir este archivo porque es de s?lo lectura en el servidor, restaurando.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>No se permite eliminar, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Error al leer la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>El servidor respondi? con un error al leer el directorio "%1": %2</translation>
</message>
@@ -4231,38 +4343,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>Error al actualizar los metadatos debido a una hora de modificaci?n inv?lida</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>La carpeta %1 no se puede hacer de s?lo lectura: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Error al actualizar los metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>El archivo se encuentra en uso</translation>
</message>
@@ -4280,12 +4392,6 @@
<translation>No se puede descargar el archivo %1 porque falta informaci?n del cifrado.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>El archivo ha cambiado desde que fue descubierto</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4342,6 +4448,12 @@
<source>The file %1 is currently in use</source>
<translation>El archivo %1 se encuentra en uso</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>El archivo ha cambiado desde que fue descubierto</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4359,39 +4471,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>no fue posible borrar el archivo %1, error: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>?No se puede crear la carpeta %1 debido a un conflicto de nombre con un archivo o carpeta local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>No se pudo crear la carpeta %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>La carpeta %1 no se puede hacer de s?lo lectura: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Error al actualizar los metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>El archivo %1 se encuentra en uso</translation>
</message>
@@ -4404,14 +4516,14 @@
<translation>No fue posible eliminar %1 porque hay un conflicto con el nombre de archivo local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>No se pudo eliminar el registro de archivo %1 de la base de datos local</translation>
</message>
@@ -4419,49 +4531,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>?No se puede renombrar la carpeta %1 debido a un conflicto de nombre con un archivo o carpeta local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>?El archivo %1 se descarg? pero gener? un conflicto con un nombre de archivo local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Error al configurar el estado fijado</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Error al actualizar los metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>El archivo %1 est? actualmente en uso</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>No se pudo propagar el renombrado del directorio en la jerarqu?a</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>No se pudo renombrar el archivo</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>No se pudo eliminar el registro de archivo %1 de la base de datos local</translation>
</message>
@@ -4518,39 +4630,39 @@
<translation>No se pudo renombrar %1 a %2, error: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Error al actualizar los metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>El archivo %1 est? actualmente en uso</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>C?digo equivocado de HTTP regresado por el servidor. Se esperaba 201, pero se recibi? "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>No se pudo eliminar el registro de archivo %1 de la base de datos local</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Error al configurar el estado fijado</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
@@ -4558,22 +4670,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>No se pudo cargar el archivo cifrado.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>El archivo %1 no puede ser cargado porque existe otro archivo con el mismo nombre, con diferencias en su uso de may?sculas / min?sculas</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>La carga de %1 excede la cuota de la carpeta</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4581,11 +4682,6 @@
<translation>El archivo %1 tiene una hora de modificaci?n inv?lida. No se debe cargar en el servidor.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Archivo eliminado (comenzar la carga) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>El archivo local cambi? durante la sincronizaci?n. Se resumir?. </translation>
@@ -4615,6 +4711,22 @@
<source>The file %1 is currently in use</source>
<translation>El archivo %1 est? actualmente en uso</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>La carga de %1 excede la cuota de la carpeta</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>No se pudo cargar el archivo cifrado.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Archivo eliminado (comenzar la carga) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4863,6 +4975,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Compartir desde el men? contextual</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Te compart? algo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Opciones de uso compartido</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Enviar enlace privado por correo electr?nico ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Copiar la liga privada al portapapeles</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>No se pudo cifrar la carpeta en "%1"</translation>
@@ -4897,43 +5035,17 @@
<translation>La siguiente carpeta fue cifrada correctamente: "%1"</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Compartir desde el men? contextual</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Seleccionar nueva ubicaci?n ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Te compart? algo</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Opciones de uso compartido</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Actividad</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Copiar la liga privada al portapapeles</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Enviar enlace privado por correo electr?nico ...</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>Dejar este recurso compartido</translation>
@@ -4949,11 +5061,6 @@
<translation>No se permite volver a compartir esta carpeta</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Copiar enlace interno</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>Cifrar</translation>
@@ -4980,12 +5087,6 @@
<translation><numerusform>Expira en %1 minutos</numerusform><numerusform>Expira en %1 minutos</numerusform><numerusform>Expira en %1 minutos</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Abrir en el navegador</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Resolver conflicto ?</translation>
@@ -5015,6 +5116,17 @@
<source>Delete</source>
<translation>Borrar</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Copiar enlace interno</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Abrir en el navegador</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5116,13 +5228,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Esta conexi?n NO es segura ya que no est? encriptado.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Versi?n del servidor: %1</translation>
@@ -5142,6 +5247,13 @@
<source>The connection is not secure</source>
<translation>La conexi?n no es segura</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Esta conexi?n NO es segura ya que no est? encriptado.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5234,6 +5346,32 @@
<translation>%1 (omitido por un error previo, intentando de nuevo en %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Solo tiene %1 disponible, se necesita de al menos %2 para iniciar</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>No fue posible abrir o crear la base de datos de sincronizaci?n local. Aseg?rate de que tengas permisos de escritura en la carpeta de sincronizaci?n.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Espacio en disco bajo: Las descargas que podr?an reducir el espacio por debajo de %1 se omitieron.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>No hay espacio disponible en el servidor para algunas cargas.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Conflicto no resuelto.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>No se pudo actualizar el archivo: %1</translation>
@@ -5254,22 +5392,6 @@
<translation>No se pudo establecer el registro del archivo en la base de datos local: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Conflicto no resuelto.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Solo tiene %1 disponible, se necesita de al menos %2 para iniciar</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>No fue posible abrir o crear la base de datos de sincronizaci?n local. Aseg?rate de que tengas permisos de escritura en la carpeta de sincronizaci?n.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Usando archivos virtuales con sufijo, pero el sufijo no est? establecido</translation>
@@ -5289,16 +5411,6 @@
<source>Cannot open the sync journal</source>
<translation>No se puede abrir el diario de sincronizaci?n</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Espacio en disco bajo: Las descargas que podr?an reducir el espacio por debajo de %1 se omitieron.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>No hay espacio disponible en el servidor para algunas cargas.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5309,7 +5421,7 @@
<translation>Sin conexi?n</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5693,11 +5805,6 @@
<source>Less than a minute</source>
<translation>Menos de un minuto</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5705,20 +5812,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5733,6 +5830,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5875,6 +5987,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Por favor inicia sesi?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>No se han configurado carpetas para sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Desconectado de %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Versi?n del Servidor No Soportada</translation>
@@ -5895,31 +6022,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Desconectado de %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Desconectado de las cunetas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Cuenta %1 : %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Por favor inicia sesi?n</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>La sincronizaci?n de cuentas est? deshabilitada</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5941,11 +6043,6 @@
<translation>macOS VFS para %1: Ocurri? un problema.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>No se han configurado carpetas para sincronizar</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Buscando cambios en el remoto "%1"</translation>
@@ -5956,6 +6053,21 @@
<translation>Buscando cambios en el local "%1"</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Desconectado de las cunetas:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Cuenta %1 : %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>La sincronizaci?n de cuentas est? deshabilitada</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5964,11 +6076,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>Carpeta &Local</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Nombre de usuario</translation>
@@ -6004,22 +6111,11 @@
<translation>Preguntar antes sincronizar carpetas mayores a</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Preguntar antes de sincronizar almacenamientos externos</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Elige qu? sincronizar</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Mantener los datos locales</translation>
@@ -6034,6 +6130,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Borrar la carpeta local y comenzar una sincronizaci?n limpia</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Elige qu? sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>Carpeta &Local</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6074,6 +6186,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%nd?a</numerusform><numerusform>%nd?as</numerusform><numerusform>%nd?as</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>en el futuro</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%nhora</numerusform><numerusform>%nhoras</numerusform><numerusform>%nhoras</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1min</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%nmin</numerusform><numerusform>%nmin</numerusform><numerusform>%nmin</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>ahora</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Hace alg?n tiempo</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6114,57 +6271,12 @@
<source>Synced %1</source>
<translation>Sincronizado %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%nd?a</numerusform><numerusform>%nd?as</numerusform><numerusform>%nd?as</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>en el futuro</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%nhora</numerusform><numerusform>%nhoras</numerusform><numerusform>%nhoras</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>ahora</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1min</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%nmin</numerusform><numerusform>%nmin</numerusform><numerusform>%nmin</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Hace alg?n tiempo</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>Las rutas que empiecen con el caracter '#' no est?n soportadas en el modo VFS.</translation>
@@ -6410,6 +6522,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>Abrir carpetas locales o de grupo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Abrir carpeta local</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Conectado</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>Desconectado</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>Abrir carpeta local "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>Abrir carpeta de grupo "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>Abrir %1 en el explorador de archivos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>Men? de carpetas de grupo de usuarios y local</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6599,16 +6754,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6623,6 +6768,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6856,16 +7011,16 @@
<translation>Ocurri? un error durante la configuraci?n</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Preparando para sincronizar</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>Deteniendo la sincronizaci?n</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Preparando para sincronizar</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>La sincronizaci?n est? pausada</translation>
@@ -6924,4 +7079,17 @@
<translation>Liberar espacio local</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>Habilitar sincronizaci?n r?pida</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>La sincronizaci?n r?pida s?lo sincronizar? los cambios en archivos y carpetas dentro de las carpetas que se han explorado. Esto puede incrementar significativamente la capacidad de respuesta en la configuraci?n inicial de archivos virtuales. Sin embargo, esto provocar? descargas redundantes de archivos movidos a carpetas inexploradas.</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_es_SV.ts nextcloud-desktop-3.16.6/translations/client_es_SV.ts
--- nextcloud-desktop-3.16.4/translations/client_es_SV.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_es_SV.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
@@ -570,7 +562,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Las carpetas no marcadas ser?n <b>eliminadas</b> de tu sistema de archivos local y ya no ser?n sincronizados a esta computadora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Cancelar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Aplicar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Conectado con <server> como <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Sincronizar todo</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Aplicar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Cancelar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Conectado con <server> como <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>No hay cuentas configuradas.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation type="unfinished"/>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>No hay cuentas configuradas.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation type="unfinished"/>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -730,12 +738,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Abrir carpeta</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -774,16 +776,6 @@
<translation>Reiniciar sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Reanudar sincronizaci?n</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Pausar sincronizaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Eliminar la conexi?n de sincronizaci?n de carpetas</translation>
@@ -809,21 +801,11 @@
<translation>Fall? la creaci?n de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar la Eliminaci?n de la Conexi?n de Sincronizaci?n de Carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>?Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrar? ning?n archivo.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar la Conexi?n de Sincronizaci?n de la Carpeta</translation>
@@ -853,23 +835,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -883,33 +865,43 @@
<translation>La operaci?n de sincronizaci?n est? en curso. <br/>?Deseas terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes l?mites</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 de %2 en uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Actualmente no hay informaci?n disponible del espacio usado.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 en uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
@@ -928,80 +920,126 @@
<translation>Actualmente el servidor %1 se encuentra en modo mantenimiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Cerraste sesi?n en %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Abrir carpeta</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Reanudar sincronizaci?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Pausar sincronizaci?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>?Realmente quieres dejar de sincronizar la carpeta <i>%1</i>?<p><b>Nota:</b> Esto <b>no</b> borrar? ning?n archivo.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>No hay %1 conexi?n configurada. </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) de %2 en uso. Algunas carpetas, incluidas carpetas montadas en red o carpetas compartidas, pueden tener diferentes l?mites</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son de almacenamiento externo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o son de almacenamiento externo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Actualmente no hay informaci?n disponible del espacio usado.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>No hay %1 conexi?n configurada. </translation>
+ </message>
</context>
<context>
<name>OCC::AccountSetupFromCommandLineJob</name>
@@ -1115,11 +1153,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation type="unfinished"/>
@@ -1130,6 +1163,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Seleccionar un certificado</translation>
@@ -1180,46 +1218,46 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Error al acceder el archivo de configuraci?n</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation type="unfinished"/>
</message>
@@ -1261,6 +1299,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1268,6 +1345,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
@@ -1472,7 +1554,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir metadatos a la base de datos</translation>
</message>
@@ -1602,21 +1684,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1630,28 +1697,28 @@
%1</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Error de autenticaci?n: El usuario o contrase?a est?n equivocados. </translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="183"/>
- <source>Timeout</source>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
<translation type="unfinished"/>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Las credenciales proporcionadas no son correctas</translation>
+ <location filename="../src/gui/connectionvalidator.cpp" line="183"/>
+ <source>Timeout</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
@@ -1663,16 +1730,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor actualiza a la versi?n m?s reciente del servidor y reinicia el cliente.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Error de autenticaci?n: El usuario o contrase?a est?n equivocados. </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Las credenciales proporcionadas no son correctas</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation type="unfinished"/>
</message>
@@ -1680,19 +1762,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1700,27 +1782,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1959,11 +2041,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
@@ -1975,15 +2052,14 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
- <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
+ <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
<message>
@@ -1993,10 +2069,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2039,6 +2121,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ha sido eliminado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ha sido actualizado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 ha sido renombrado a %2. </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 se ha movido a %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2054,17 +2164,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido eliminados. </numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ha sido eliminado.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -2080,33 +2179,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform><numerusform>%1 y %n otro(s) archivo(s) han sido actualizados.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ha sido actualizado.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform><numerusform>%1 ha sido renombrado como %2 y %n otro(s) archivo(s) han sido renombrados. </numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 ha sido renombrado a %2. </translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform><numerusform>%1 se ha movido a %2 y %n otro(s) archivo(s) han sido movidos.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 se ha movido a %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2143,67 +2225,67 @@
<translation>Sincronizar Actividad</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>No fue posible leer el archivo de exclusi?n del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una nueva carpeta de m?s de %1 MB ha sido agregada: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una carpeta de un almacenamiento externo ha sido agregada.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor ve a las configuraciones para seleccionarlo si deseas descargarlo. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2212,41 +2294,41 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2287,11 +2369,6 @@
<translation>No fue posible restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(respaldo)</translation>
@@ -2302,6 +2379,11 @@
<translation>(respaldo %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation type="unfinished"/>
@@ -2372,16 +2454,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>La sincronizaci?n est? pausada.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (La sincronizaci?n est? pausada)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2428,6 +2500,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>La sincronizaci?n est? pausada.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (La sincronizaci?n est? pausada)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2471,16 +2553,6 @@
<translation>Se present? un error al cargar la lista de carpetas desde el servidor. </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Hay conflictos sin resolver. Haz click para m?s detalles. </translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation type="unfinished"/>
@@ -2522,15 +2594,30 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Hay conflictos sin resolver. Haz click para m?s detalles. </translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2578,21 +2665,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 de %2, archivo %3 de %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2752,11 +2834,6 @@
<translation>Configuraciones generales</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Lanzar al Iniciar el Sistema</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation type="unfinished"/>
@@ -2767,11 +2844,6 @@
<translation>Para la Bandeja del Sistema</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Usar ?conos &Monocrom?ticos</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2787,17 +2859,32 @@
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Perdir confirmaci?p?n antes de sincronizar almacenamientos externos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Lanzar al Iniciar el Sistema</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Usar ?conos &Monocrom?ticos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2808,11 +2895,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Perdir confirmaci?p?n antes de sincronizar almacenamientos externos</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2864,11 +2946,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Reinicia && Actualiza</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation type="unfinished"/>
@@ -2889,6 +2966,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Reinicia && Actualiza</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
@@ -2909,6 +2996,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation type="unfinished"/>
@@ -2983,6 +3075,11 @@
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3143,102 +3240,97 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation type="unfinished"/>
</message>
@@ -3359,16 +3451,6 @@
<translation><p>Una nueva versi?n del Cliente %1 est? disponible.</p><p><b>%2</b> est? disponible para descargar. La versi?n instalada es la %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Omitir esta vez</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Obtener la actualizaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation type="unfinished"/>
@@ -3393,6 +3475,16 @@
<source>Update manually</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Omitir esta vez</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Obtener la actualizaci?n</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3417,6 +3509,23 @@
<translation>El servidor Proxy requiere de autenticaci?n</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Ancho de banda para Descarga</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Limitar a</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation type="unfinished"/>
@@ -3439,46 +3548,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Ancho de banda para Descarga</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Sin l?mite</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Limitar a</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Limitar a 3/4 del ancho de banda estimado</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Ancho de banda para Carga</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Limitar autom?ticamente</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Ancho de banda para Carga</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Nombre del servidor proxy</translation>
@@ -3507,6 +3599,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>No fue posible verificar nuevas actualizaciones.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation type="unfinished"/>
@@ -3537,11 +3639,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>No fue posible verificar nuevas actualizaciones.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation type="unfinished"/>
@@ -3552,14 +3649,19 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation>Estado de la actualizaci?n desconocido. No se verific? si hab?a nuevas actualizaciones. </translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
- <source>Update status is unknown: Did not check for new updates.</source>
- <translation>Estado de la actualizaci?n desconocido. No se verific? si hab?a nuevas actualizaciones. </translation>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
@@ -3737,11 +3839,6 @@
<translation><font color="green">Conectado exitosamente a %1: %2 versi?n %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>URL Inv?lido</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Hubo una falla al conectarse a %1 en %2: <br/>%3</translation>
@@ -3752,6 +3849,16 @@
<translation>Expir? el tiempo al tratar de conectarse a %1 en %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Acceso prohibido por el servidor. Para verificar que tengas el acceso correcto, <a href="%1">haz click aqu?</a> para acceder al servicio con tu navegador.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>URL Inv?lido</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation type="unfinished"/>
@@ -3762,11 +3869,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Acceso prohibido por el servidor. Para verificar que tengas el acceso correcto, <a href="%1">haz click aqu?</a> para acceder al servicio con tu navegador.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation type="unfinished"/>
@@ -3972,68 +4074,58 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
+ <source>File names containing the character "%1" are not supported on this file system.</source>
+ <comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
- <source>File names containing the character "%1" are not supported on this file system.</source>
- <comment>%1: the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
+ <source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
+ <source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>Folder name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
+ <source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
+ <source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
- <source>File name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="433"/>
+ <source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
- <source>Folder name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
- <source>File name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="433"/>
- <source>Filename contains trailing spaces.</source>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
@@ -4045,6 +4137,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
@@ -4135,64 +4237,74 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation type="unfinished"/>
</message>
@@ -4200,38 +4312,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4249,12 +4361,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>El archivo ha cambiado desde que fue descubierto</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4311,6 +4417,12 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>El archivo ha cambiado desde que fue descubierto</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4328,39 +4440,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>no fue posible borrar el archivo %1, error: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4373,14 +4485,14 @@
<translation>No fue posible eliminar %1 porque hay un conflicto con el nombre de archivo local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4388,49 +4500,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4487,39 +4599,39 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>C?digo equivocado de HTTP regresado por el servidor. Se esperaba 201, pero se recibi? "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
@@ -4527,22 +4639,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>El archivo %1 no puede ser cargado porque existe otro archivo con el mismo nombre, con diferencias en su uso de may?sculas / min?sculas</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>La carga de %1 excede la cuota de la carpeta</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4550,11 +4651,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>El archivo local cambi? durante la sincronizaci?n. Se resumir?. </translation>
@@ -4584,6 +4680,22 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>La carga de %1 excede la cuota de la carpeta</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4832,6 +4944,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Te compart? algo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Copiar la liga privada al portapapeles</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4864,43 +5002,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Te compart? algo</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Copiar la liga privada al portapapeles</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4916,11 +5028,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -4947,12 +5054,6 @@
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation type="unfinished"/>
@@ -4982,6 +5083,17 @@
<source>Delete</source>
<translation>Borrar</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5083,13 +5195,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Esta conexi?n NO es segura ya que no est? encriptado.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation type="unfinished"/>
@@ -5109,6 +5214,13 @@
<source>The connection is not secure</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Esta conexi?n NO es segura ya que no est? encriptado.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5201,6 +5313,32 @@
<translation>%1 (omitido por un error previo, intentando de nuevo en %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Solo tiene %1 disponible, se necesita de al menos %2 para iniciar</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>No fue posible abrir o crear la base de datos de sincronizaci?n local. Aseg?rate de que tengas permisos de escritura en la carpeta de sincronizaci?n.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Espacio en disco bajo: Las descargas que podr?an reducir el espacio por debajo de %1 se omitieron.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>No hay espacio disponible en el servidor para algunas cargas.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Conflicto no resuelto.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation type="unfinished"/>
@@ -5221,22 +5359,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Conflicto no resuelto.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Solo tiene %1 disponible, se necesita de al menos %2 para iniciar</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>No fue posible abrir o crear la base de datos de sincronizaci?n local. Aseg?rate de que tengas permisos de escritura en la carpeta de sincronizaci?n.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
@@ -5256,16 +5378,6 @@
<source>Cannot open the sync journal</source>
<translation>No se puede abrir el diario de sincronizaci?n</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Espacio en disco bajo: Las descargas que podr?an reducir el espacio por debajo de %1 se omitieron.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>No hay espacio disponible en el servidor para algunas cargas.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5276,7 +5388,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5660,11 +5772,6 @@
<source>Less than a minute</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5672,20 +5779,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5700,6 +5797,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5842,6 +5954,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Por favor inicia sesi?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>No se han configurado carpetas para sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Desconectado de %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Versi?n del Servidor No Soportada</translation>
@@ -5862,31 +5989,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Desconectado de %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Desconectado de las cunetas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Cuenta %1 : %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Por favor inicia sesi?n</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>La sincronizaci?n de cuentas est? deshabilitada</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5908,11 +6010,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>No se han configurado carpetas para sincronizar</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation type="unfinished"/>
@@ -5923,6 +6020,21 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Desconectado de las cunetas:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Cuenta %1 : %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>La sincronizaci?n de cuentas est? deshabilitada</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5931,11 +6043,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>Carpeta &Local</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation type="unfinished"/>
@@ -5971,22 +6078,11 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Elige qu? sincronizar</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation type="unfinished"/>
@@ -6001,6 +6097,22 @@
<source>Erase local folder and start a clean sync</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Elige qu? sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>Carpeta &Local</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6041,6 +6153,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>en el futuro</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>ahora</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Hace alg?n tiempo</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6081,57 +6238,12 @@
<source>Synced %1</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>en el futuro</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>ahora</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Hace alg?n tiempo</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6377,6 +6489,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6566,16 +6721,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6590,6 +6735,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6823,16 +6978,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Preparando para sincronizar</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Preparando para sincronizar</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>La sincronizaci?n est? pausada</translation>
@@ -6891,4 +7046,17 @@
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_es.ts nextcloud-desktop-3.16.6/translations/client_es.ts
--- nextcloud-desktop-3.16.4/translations/client_es.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_es.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>Habilitar sincronizaci?n r?pida</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>La sincronizaci?n r?pida s?lo sincronizar? los cambios en archivos y carpetas dentro de las carpetas que se han explorado. Esto puede incrementar significativamente la capacidad de respuesta en la configuraci?n inicial de los archivos virtuales. Sin embargo, esto provocar? descargas redundantes de archivos movidos a carpetas inexploradas.</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>Activar archivos virtuales</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -558,7 +550,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Importaci?n legada</translation>
</message>
@@ -573,7 +565,7 @@
<translation>Saltar</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>No se pudieron importar las cuentas desde la configuraci?n del cliente antiguo.</translation>
</message>
@@ -581,33 +573,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Espacio de almacenamiento: ...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Las carpetas no seleccionadas ser?n <b>eliminadas</b> de su carpeta local y ya no ser?n sincronizadas en este ordenador</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Cancelar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Aplicar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Conectado a <server> como <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Sincronizar todo</translation>
@@ -638,6 +608,33 @@
<translation>Configuraci?n de conexi?n</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Aplicar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Espacio de almacenamiento: ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Cancelar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Conectado a <server> como <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>No se ha configurado ninguna cuenta.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>Cifrado de extremo a extremo con Archivos Virtuales</translation>
@@ -672,9 +669,9 @@
<b>Este proceso no es puede deshacer. ?Seguro que desea continuar?</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>No se ha configurado ninguna cuenta.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -687,6 +684,11 @@
<translation>Mostrar regla mnemot?cnica</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>El cifrado de extremo a extremo a sido habilitado para esta cuenta</translation>
@@ -712,6 +714,12 @@
<translation>La carpeta tiene un problema de sincronizaci?n. El cifrado de esta carpeta ser? posible cuando se haya sincronizado correctamente.</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -736,12 +744,6 @@
<translation>No es posible cifrar la carpeta porque ya no existe</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Abrir carpeta</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Cifrar</translation>
@@ -780,16 +782,6 @@
<translation>Reiniciar sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Continuar sincronizaci?n</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Pausar sincronizaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Eliminar la sincronizaci?n de carpetas conectadas</translation>
@@ -815,21 +807,11 @@
<translation>Ha fallado la creaci?n de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>No pudo crear la carpeta local <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirme la sincronizaci?n para la eliminaci?n de la carpeta conectada</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>?De verdad quiere dejar de sincronizar la carpeta <i>%1</i>?</p><p><b>Nota:</b> Esto <b>no</b> elminar? los archivo.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar carpeta de sincronizaci?n conectada</translation>
@@ -863,24 +845,24 @@
<translation>Mnem?nico para cifrado de extremo a extremo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>Para proteger su identidad criptogr?fica, ciframos la misma con una regla mnemot?cnica de 12 palabras de diccionario. Por favor, an?telas y cons?rvelas a salvo. Estas palabras ser?n necesarias para a?adir otros dispositivos a su cuenta (como su tel?fono m?vil o un port?til). </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>Deshabilitar cifrado de extremo a extremo</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>?Deshabilitar cifrado de extremo a extremo para %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>Quitar el cifrado de extremo a extremo borrar? los archivos sincronizados localmente que se encuentran cifrados.<br>Los archivos cifrados se mantendr?n en el servidor.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -893,34 +875,44 @@
<translation>La sincronizaci?n est? en curso.<br/>?Desea interrumpirla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) de %2 en uso. Algunas carpetas, como carpetas de red o compartidas, podr?an tener l?mites diferentes.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 de %2 en uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>Migrar certificado a uno nuevo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Actualmente no hay informaci?n disponible sobre el uso de almacenamiento.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>Existen carpetas que han aumentado de tama?o m?s all? de %1MB: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 en uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 como %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>El cifrado de extremo a extremo ha sido habilitado en esta cuenta con otro dispositivo.<br> puede ser habilitado en este dispositivo ingresando su mnem?nico.<br> Esto habilitar? la sincronizaci?n de las carpetas cifradas existentes</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>?La versi?n %1 del servidor no est? soportada! Si contin?as, lo haces bajo tu propio riesgo.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Configurar cifrado</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Esta cuenta soporta cifrado punto a punto</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -938,79 +930,125 @@
<translation>El servidor %1 se encuentra en modo mantenimiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>El servidor %1 est? siendo redirigido actualmente, ?, su conexi?n est? detr?s de un portal cautivo.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Cerr? sesi?n desde %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Conectando a %1 ...</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Hay carpetas que no se han sincronizado porque son demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>No es posible conectarse con %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Hay carpetas que no se han sincronizado porque est?n en el almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Error de configuraci?n del servidor: %1 en %2,</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Hay carpetas que no se han sincronizado porque son demasiado grandes o est?n en el almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>Debe aceptar los t?rminos de servicio en %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Abrir carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>No hay ninguna conexi?n de %1 configurada.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Continuar sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>Migrar certificado a uno nuevo</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Pausar sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Hay carpetas que no se han sincronizado porque son demasiado grandes:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>No pudo crear la carpeta local <i>%1</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Hay carpetas que no se han sincronizado porque est?n en el almacenamiento externo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>?De verdad quiere dejar de sincronizar la carpeta <i>%1</i>?</p><p><b>Nota:</b> Esto <b>no</b> elminar? los archivo.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Hay carpetas que no se han sincronizado porque son demasiado grandes o est?n en el almacenamiento externo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>Para proteger su identidad criptogr?fica, ciframos la misma con una regla mnemot?cnica de 12 palabras de diccionario. Por favor, an?telas y cons?rvelas a salvo. Estas palabras ser?n necesarias para a?adir otros dispositivos a su cuenta (como su tel?fono m?vil o un port?til). </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>Existen carpetas que han aumentado de tama?o m?s all? de %1MB: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>Deshabilitar cifrado de extremo a extremo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>El cifrado de extremo a extremo ha sido habilitado en esta cuenta con otro dispositivo.<br> puede ser habilitado en este dispositivo ingresando su mnem?nico.<br> Esto habilitar? la sincronizaci?n de las carpetas cifradas existentes</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>?Deshabilitar cifrado de extremo a extremo para %1?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Esta cuenta soporta cifrado punto a punto</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>Quitar el cifrado de extremo a extremo borrar? los archivos sincronizados localmente que se encuentran cifrados.<br>Los archivos cifrados se mantendr?n en el servidor.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Configurar cifrado</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) de %2 en uso. Algunas carpetas, como carpetas de red o compartidas, podr?an tener l?mites diferentes.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 de %2 en uso</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Actualmente no hay informaci?n disponible sobre el uso de almacenamiento.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 como %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>?La versi?n %1 del servidor no est? soportada! Si contin?as, lo haces bajo tu propio riesgo.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>El servidor %1 est? siendo redirigido actualmente, ?, su conexi?n est? detr?s de un portal cautivo.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Conectando a %1 ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>No es posible conectarse con %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Error de configuraci?n del servidor: %1 en %2,</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>Debe aceptar los t?rminos de servicio en %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>No hay ninguna conexi?n de %1 configurada.</translation>
</message>
</context>
<context>
@@ -1125,11 +1163,6 @@
<translation>Certificado & Key (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Explorar ...</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Contrase?a del certificado:</translation>
@@ -1140,6 +1173,11 @@
<translation>Usar encriptaci?n pkcs12 es muy recomendable, puesto que una copia se guardar? en el archivo de configuraci?n.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Explorar ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Seleccione un certificado</translation>
@@ -1190,34 +1228,34 @@
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 cuentas</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 cuenta</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 carpetas</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 carpeta</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Importaci?n legada</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1225,12 +1263,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Error al acceder al archivo de configuraci?n</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>Se ha producido un error al acceder al archivo de configuraci?n en %1. Por favor, aseg?rese de que su cuenta del sistema puede acceder al archivo.</translation>
</message>
@@ -1272,6 +1310,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1279,6 +1356,11 @@
<translation>El archivo %1 no se puede subir porque ya existe otro con el mismo nombre, solo difiere en las may?sculas/min?sculas</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>El archivo %1 tiene una hora de modificaci?n no v?lida. No subir al servidor.</translation>
@@ -1483,7 +1565,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir los metadatos en la base de datos</translation>
</message>
@@ -1613,21 +1695,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>?Quieres eliminar la carpeta <i>%1</i> y todo su contenido permanentemente?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>?Quieres eliminar el archivo <i>%1</i> permanentemente?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Confirmar borrado</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1643,30 +1710,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>La cuenta Nextcloud no est? configurada</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>?Quieres eliminar la carpeta <i>%1</i> y todo su contenido permanentemente?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Error de autenticaci?n: El usuario o la contrase?a son incorrectos</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>?Quieres eliminar el archivo <i>%1</i> permanentemente?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Confirmar borrado</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Tiempo de espera superado</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Las credenciales proporcionadas no son correctas</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>La configuraci?n del servidor para este cliente es demasiado antigua</translation>
@@ -1676,16 +1743,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor, actualice a la ?ltima versi?n del servidor y reinicie el cliente.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Error de autenticaci?n: El usuario o la contrase?a son incorrectos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>La cuenta Nextcloud no est? configurada</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Las credenciales proporcionadas no son correctas</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Error al cancelar la eliminaci?n de un archivo</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>Error al cancelar la eliminaci?n de %1</translation>
</message>
@@ -1693,19 +1775,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Error del servidor: ?la respuesta de PROPFIND no tiene formato XML!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>?Hubo un error al configurar los metadatos cifrados!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>Error de configuraci?n de los metadatos cifrados: la firma inicial del servidor est? vac?a.</translation>
</message>
@@ -1713,27 +1795,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Error al abrir el directorio %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Directorio no accesible en el cliente, permiso denegado</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Directorio no encontrado: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>La codificaci?n del nombre del archivo no es v?lida</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Error al leer el directorio %1</translation>
</message>
@@ -1973,11 +2055,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>La URL de la consulta no comienza con HTTPS a pesar de que la URL de inicio de sesi?n comenz? con HTTPS. El inicio de sesi?n no ser? posible porque esto podr?a ser un problema de seguridad. Por favor, p?ngase en contacto con su administrador.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>La URL de consulta no comienza con HTTPS a pesar de que la URL de inicio de sesi?n comenz? con HTTPS. El inicio de sesi?n no ser? posible porque esto podr?a ser un problema de seguridad. Por favor, p?ngase en contacto con su administrador.</translation>
@@ -1989,28 +2066,33 @@
<translation>Error devuelto por el servidor: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>La URL de la consulta no comienza con HTTPS a pesar de que la URL de inicio de sesi?n comenz? con HTTPS. El inicio de sesi?n no ser? posible porque esto podr?a ser un problema de seguridad. Por favor, p?ngase en contacto con su administrador.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Hubo un error accediendo al "token" endpoint: <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>No se pudo procesar el c?digo JSON recibido del servidor: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>La respuesta del servidor no contiene todos los campos esperados</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>No se pudo procesar el c?digo JSON recibido del servidor: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2053,6 +2135,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ha sido eliminado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ha sido actualizado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 ha sido renombrado a %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 ha sido movido a %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>Por favor, escoja una ubicaci?n diferente. La carpeta %1 no existe.</translation>
@@ -2068,17 +2178,6 @@
<translation>Por favor, escoja una ubicaci?n diferente. La carpeta %1 no se puede leer.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 y otro archivo han sido borrados.</numerusform><numerusform>%1 y otros %n archivos han sido borrados.</numerusform><numerusform>%1 y otros %n archivos han sido borrados.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ha sido eliminado.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 y %n otro(s) archivo(s) ha(n) sido a?adido(s).</numerusform><numerusform>%1 y %n otro(s) archivo(s) ha(n) sido a?adido(s).</numerusform><numerusform>%1 y %n otro(s) archivo(s) ha(n) sido a?adido(s).</numerusform></translation>
@@ -2094,33 +2193,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 y otro archivo han sido actualizados.</numerusform><numerusform>%1 y otros %n archivos han sido actualizados.</numerusform><numerusform>%1 y otros %n archivos han sido actualizados.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ha sido actualizado.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ha sido renombrado a %2 y otro archivo ha sido renombrado.</numerusform><numerusform>%1 ha sido renombrado a %2 y otros %n archivos han sido renombrado.</numerusform><numerusform>%1 ha sido renombrado a %2 y otros %n archivos han sido renombrado.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 ha sido renombrado a %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 ha sido movido a %2 y otro archivo ha sido movido.</numerusform><numerusform>%1 ha sido movido a %2 y otros %n archivos han sido movidos.</numerusform><numerusform>%1 ha sido movido a %2 y otros %n archivos han sido movidos.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 ha sido movido a %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2157,68 +2239,68 @@
<translation>Actividad de la sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>No se ha podido leer el archivo de exclusi?n del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una carpeta mayor de %1 MB ha sido a?adida: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una carpeta de almacenamiento externo ha sido a?adida.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor vaya a opciones a seleccionarlo si desea descargar esto.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>Una carpeta ha sobrepasado el l?mite establecido de tama?o de %1MB: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>Continuar sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>Detener sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>La carpeta %1 ha sobrepasado el l?mite establecido de tama?o de %2MB.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>?Desea detener la sincronizaci?n de esta carpeta?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Se ha creado la carpeta %1 pero se excluy? de la sincronizaci?n con anterioridad. Los datos en su interior no se sincronizar?n.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Se ha creado el archivo %1 pero se excluy? de la sincronizaci?n con anterioridad. No se sincronizar?.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2231,12 +2313,12 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>La descarga del archivo virtual ha fallado con c?digo "%1" , estado "%2" y mensaje de error "%3"</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2245,7 +2327,7 @@
Alternativamente, puede restaurar todos los archivos borrados subi?ndolos desde la carpeta '%1' al servidor.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2254,22 +2336,22 @@
Alternativamente, puede restaurar todos los archivos borrados descarg?ndolos del servidor.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>?Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>Continuar con la eliminaci?n</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>Restaurar los archivos al servidor</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>Restaurar los archivos desde el servidor</translation>
</message>
@@ -2310,11 +2392,6 @@
<translation>No se ha podido restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>Se ha encontrado un registro de sincronizaci?n antiguo "%1", que no se ha podido eliminar. Por favor, aseg?rese de que ninguna aplicaci?n lo est? utilizando en este momento.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(copia de seguridad)</translation>
@@ -2325,6 +2402,11 @@
<translation>(copia de seguridad %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>Se ha encontrado un registro de sincronizaci?n antiguo "%1", que no se ha podido eliminar. Por favor, aseg?rese de que ninguna aplicaci?n lo est? utilizando en este momento.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Estado no definido.</translation>
@@ -2395,16 +2477,6 @@
<translation>La solicitud de sincronizaci?n fue cancelada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>La sincronizaci?n est? en pausa.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (Sincronizaci?n en pausa)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>Por favor, escoja una ubicaci?n diferente. La carpeta seleccionada no es v?lida.</translation>
@@ -2454,6 +2526,16 @@
Para resolver este problema: Por favor, quite %1 de alguna de las cuentas y cree una nueva carpeta de sincronizaci?n.
Para usuarios avanzados: Este problema puede estar relacionado a m?ltiples archivos de base de datos de sincronizaci?n ubicados en una carpeta. Por favor, chequee en %1 la existencia de archivos .sync_*.db desactualizados o sin usar y elim?nelos.</translation>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>La sincronizaci?n est? en pausa.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (Sincronizaci?n en pausa)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2497,16 +2579,6 @@
<translation>Error mientras se cargaba la lista de carpetas desde el servidor.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Obteniendo la lista de carpetas del servidor ...</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Hay conflictos sin resolver. Haz clic para m?s detalles.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>El soporte para archivos virtuales est? activado.</translation>
@@ -2548,16 +2620,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>Descargando %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>Archivo %1 de %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Hay conflictos sin resolver. Haz clic para m?s detalles.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>Descargando %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Obteniendo la lista de carpetas del servidor ...</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2604,21 +2691,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 de %2, archivo %3 de %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>Archivo %1 de %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>Esperando a otra %n carpeta ...</numerusform><numerusform>Esperando a %n carpeta(s)?</numerusform><numerusform>Esperando a %n carpeta(s)?</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>A punto de comenzar a sincronizar</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>Esperando a otra %n carpeta ...</numerusform><numerusform>Esperando a %n carpeta(s)?</numerusform><numerusform>Esperando a %n carpeta(s)?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2778,11 +2860,6 @@
<translation>Ajustes generales</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Ejecutar al iniciar el sistema</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>Mostrar notificaciones de llamadas</translation>
@@ -2793,11 +2870,6 @@
<translation>A la bandeja del sistema</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Usar iconos &monocrom?ticos</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>Mostrar las notificaciones de Chat</translation>
@@ -2813,17 +2885,32 @@
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Pedir confirmaci?n antes de sincronizar carpetas nuevas mayores a</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Preguntar si se desea sincronizar carpetas de almacenamiento externo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Ejecutar al iniciar el sistema</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Usar iconos &monocrom?ticos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Pedir confirmaci?n antes de sincronizar carpetas nuevas mayores a</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>Notificar cuando las carpetas sincronizadas aumenten su tama?o m?s all? del l?mite especificado</translation>
@@ -2834,11 +2921,6 @@
<translation>Deshabilitar sincronizaci?n de manera autom?tica para las carpetas que sobrepasen el l?mite</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Preguntar si se desea sincronizar carpetas de almacenamiento externo</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>Mover archivos eliminados a la papelera</translation>
@@ -2890,11 +2972,6 @@
<translation>Canal de actualizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Reiniciar && Actualizar</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>Comprobar &actualizaciones autom?ticamente</translation>
@@ -2915,6 +2992,16 @@
<translation>Aviso Legal</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Reiniciar && Actualizar</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Notificaciones del servidor que requieren atenci?n.</translation>
@@ -2935,6 +3022,11 @@
<translation>No puedes desactivar el inicio autom?tico porque el inicio autom?tico de todo el sistema est? activado.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>stable</translation>
@@ -3016,6 +3108,11 @@
<source>Debug archive is created at %1</source>
<translation>El archivo de depuraci?n se ha creado en %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3180,102 +3277,97 @@
<translation>Nuevo nombre de archivo</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Renombrar archivo</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>El archivo "%1" no pudo ser sincronizado porque el nombre contiene caracteres no permitidos en este sistema.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>Los siguientes caracteres no se permiten en el sistema: * " | & ? , ; : \ / ~ < > espacios al inicio/final</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>No se ha podido sincronizar el archivo "%1" porque su nombre contiene caracteres que no est?n permitidos en el servidor.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>Los siguientes caracteres no est?n permitidos: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>Los siguientes nombres base no est?n permitidos: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>Los siguientes nombres de archivo no est?n permitidos: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>Las siguients extensiones de archivo no est?n permitidas: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Comprobando los permisos de para renombrado ?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>No tienes permisos para renombrar este archivo. Por favor, dile al autor del archivo que lo renombre.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>Fallo en la obtenci?n de permisos con error %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>El nombre del archivo contiene espacios iniciales y finales.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>El nombre del archivo contiene espacios iniciales.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>El nombre del archivo contiene espacios finales.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>Utilizar nombre inv?lido</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>El nombre del archivo contiene caracteres ilegales: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>No se ha podido renombrar el archivo. Por favor, aseg?rese de que est? conectado al servidor.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>No se puede renombrar el archivo porque hay un archivo con el mismo nombre en el servidor. Por favor, elija otro nombre.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>No se ha podido renombrar el archivo local. %1</translation>
</message>
@@ -3399,16 +3491,6 @@
<translation><p>Una nueva versi?n del programa cliente de %1 est? disponible.</p><p><b>%2</b> est? disponible para descargar. La versi?n instalada es la %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Omitir esta vez</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Actualizar</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>La actualizaci?n fall?</translation>
@@ -3433,6 +3515,16 @@
<source>Update manually</source>
<translation>Actualizar manualmente</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Omitir esta vez</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Actualizar</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3457,6 +3549,23 @@
<translation>El servidor proxy requiere autenticaci?n</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Velocidad de descarga</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Limitar a</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>Nota: los ajustes de proxy no tienen efecto para cuentas en el sistema local.</translation>
@@ -3479,46 +3588,29 @@
<translation>Usar la configuraci?n global</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Velocidad de descarga</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Ilimitado</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Limitar a</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Limitar a 3/4 de la velocidad estimada</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Velocidad de subida</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Limitar autom?ticamente</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Velocidad de subida</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Nombre del host para servidor proxy</translation>
@@ -3547,6 +3639,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>No se puede comprobar si hay actualizaciones.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Consultando al servidor de actualizaciones ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>La nueva %1 actualizaci?n est? lista</translation>
@@ -3577,11 +3679,6 @@
<translation>No se pudo descargar la actualizaci?n. Por favor, abra %1 para descargarla manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>No se puede comprobar si hay actualizaciones.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>La nueva %1 est? disponible. Por favor, abra<a href='%2'>%2</a> para descargar la actualizaci?n.</translation>
@@ -3592,16 +3689,21 @@
<translation>La nueva %1 est? disponible. Por favor, abra %2 para descargar la actualizaci?n.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Consultando al servidor de actualizaciones ...</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Estado de actualizaci?n desconocido: no se buscaron nuevas actualizaciones.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>No hay actualizaciones disponibles. Tiene la ?ltima versi?n.</translation>
@@ -3777,11 +3879,6 @@
<translation><font color="green">Conectado con ?xito a %1: versi?n %2 %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>URL no v?lida.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Fallo al conectar %1 a %2:<br/>%3</translation>
@@ -3792,6 +3889,16 @@
<translation>Tiempo de espera agotado mientras se intentaba conectar a %1 en %2</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Acceso denegado por el servidor. Para verificar que tiene acceso, <a href="%1">haga clic aqu?</a> para acceder al servicio desde el navegador.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>URL no v?lida.</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Intentando conectar a %1 desde %2 ...</translation>
@@ -3802,11 +3909,6 @@
<translation>La petici?n autenticada al servidor ha sido redirigida a "%1". La URL es err?nea, el servidor est? mal configurado.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Acceso denegado por el servidor. Para verificar que tiene acceso, <a href="%1">haga clic aqu?</a> para acceder al servicio desde el navegador.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>Ha habido una respuesta no v?lida a una solicitud autenticada de WebDAV</translation>
@@ -4018,62 +4120,34 @@
<translation>Los nombres de archivo que terminan con un punto no son compatibles con este sistema de archivos.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Carpeta</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Archivo</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>El nombre %1 que contiene el car?cter "%2" no est? soportado en este sistema de archivos.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>El nombre %1 contiene al menos un car?cter inv?lido</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>El nombre %1 es un nombre reservado en este sistema de archivos.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>El nombre del archivo contiene al menos un car?cter no v?lido</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4083,6 +4157,24 @@
<translation>El nombre del archivo contiene espacios finales.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Carpeta</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Archivo</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>El nombre %1 que contiene el car?cter "%2" no est? soportado en este sistema de archivos.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4091,6 +4183,16 @@
<translation>No puede ser renombrado o subido.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>El nombre %1 contiene al menos un car?cter inv?lido</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>El nombre %1 es un nombre reservado en este sistema de archivos.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>El nombre del archivo contiene espacios iniciales.</translation>
@@ -4181,64 +4283,74 @@
<translation>El servidor inform? de no %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>No se puede sincronizar debido a una hora de modificaci?n no v?lida</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>No es posible subir el archivo, porque est? abierto en "%1".</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>Error mientras se borraba el registro de archivo %1 de la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>Movido a un lugar no v?lido, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>No se puede modificar el item cifrado ya que el certificado seleccionado no es v?lido.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorado porque se encuentra en la lista negra de ?elija qu? va a sincronizar?</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>No permitido porque no tienes permiso para a?adir subcarpetas a esa carpeta.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>No permitido porque no tienes permiso para a?adir archivos a esa carpeta.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>No est? permitido subir este archivo porque es de solo lectura en el servidor, restaurando.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>No est? permitido borrar, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Error mientras se le?a la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>El servidor contest? con un error al leer el directorio "%1" : %2</translation>
</message>
@@ -4246,38 +4358,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>No se pudo eliminar el archivo %1 de la DB local</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>Error al actualizar los metadatos debido a una hora de modificaci?n no v?lida</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>La carpeta %1 no se puede hacer de s?lo lectura: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>excepci?n inv?lida</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Error al actualizar los metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>El archivo se encuentra en uso</translation>
</message>
@@ -4295,12 +4407,6 @@
<translation>El archivo %1 no puede ser descargado porque falta la informaci?n de cifrado,</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>El archivo ha cambiado desde que fue descubierto</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4357,6 +4463,12 @@
<source>The file %1 is currently in use</source>
<translation>El archivo %1 se encuentra en uso</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>El archivo ha cambiado desde que fue descubierto</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4374,39 +4486,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>no se ha podido borrar el archivo %1, error: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>?La carpeta %1 no se pudo crear a causa de un conflicto con el nombre de un archivo o carpeta local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>No se pudo crear la carpeta %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>La carpeta %1 no se puede hacer de s?lo lectura: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>excepci?n inv?lida</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Error al actualizar los metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>El archivo %1 se encuentra en uso</translation>
</message>
@@ -4419,14 +4531,14 @@
<translation>No se ha podido eliminar %1 por causa de un conflicto con el nombre de un archivo local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation>Error temporal al quitar ?tem local que fue eliminado del servidor.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>No fue posible borrar el registro del archivo %1 de la base de datos local</translation>
</message>
@@ -4434,49 +4546,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>?La carpeta %1 no puede ser renombrada ya que un archivo o carpeta local causa un conflicto de nombre!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>?El archivo %1 se descarg? pero result? en un conflicto con el nombre de un archivo local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>No se pudo obtener el archivo %1 de la DB local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Error al configurar el estado fijado</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Error al actualizar los metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>El archivo %1 se encuentra en uso</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>Fallo al propagar el renombrado de carpeta en la jerarqu?a</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Fallo al renombrar el archivo</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>No fue posible borrar el registro del archivo %1 de la base de datos local</translation>
</message>
@@ -4533,39 +4645,39 @@
<translation>No se puede renombrar %1 a %2, error: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Error al actualizar los metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>El archivo %1 se encuentra en uso</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>El c?digo HTTP devuelto por el servidor es err?neo. Esperado 201, pero recibido "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>No se pudo obtener el archivo %1 de la DB local</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>No fue posible borrar el registro del archivo %1 de la base de datos local</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Error al configurar el estado fijado</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir los metadatos en la base de datos</translation>
</message>
@@ -4573,22 +4685,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>Fallo al subir el archivo cifrado.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>El archivo %1 no se puede subir porque ya existe otro con el mismo nombre. Puede que s?lo haya diferencias de may?sculas/min?sculas</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>La subida %1 excede el l?mite de tama?o de la carpeta</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4596,11 +4697,6 @@
<translation>El archivo %1 tiene una hora de modificaci?n no v?lida. No subir al servidor.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Archivo eliminado (comenzar subida) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Un archivo local ha cambiado durante la sincronizaci?n. Se reanudar?.</translation>
@@ -4630,6 +4726,22 @@
<source>The file %1 is currently in use</source>
<translation>El archivo %1 se encuentra en uso</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>La subida %1 excede el l?mite de tama?o de la carpeta</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>Fallo al subir el archivo cifrado.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Archivo eliminado (comenzar subida) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4878,6 +4990,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Compartir en men? contextual</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>He compartido algo contigo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Opciones de compartir</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Enviar enlace privado por correo electr?nico ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Copiar enlace privado al portapapeles</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>No se pudo cifrar carpeta en "%1"</translation>
@@ -4912,43 +5050,17 @@
<translation>La siguiente carpeta se cifr? con ?xito: "%1"</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Compartir en men? contextual</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Seleccione nueva ubicaci?n ?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>He compartido algo contigo</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Opciones de compartir</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Actividad</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Copiar enlace privado al portapapeles</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Enviar enlace privado por correo electr?nico ...</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>Abandonar este recurso compartido</translation>
@@ -4964,11 +5076,6 @@
<translation>No est? permitido compartir de nuevo esta carpeta</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Copiar enlace interno</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>Cifrar</translation>
@@ -4995,12 +5102,6 @@
<translation><numerusform>Caduca en %1 minuto</numerusform><numerusform>Caduca en %1 minutos</numerusform><numerusform>Caduca en %1 minutos</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Abrir en navegador</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Resolver conflicto ?</translation>
@@ -5030,6 +5131,17 @@
<source>Delete</source>
<translation>Eliminar</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Copiar enlace interno</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Abrir en navegador</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5131,13 +5243,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Esta conexi?n NO ES SEGURA, pues no est? cifrada.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Versi?n del servidor: %1</translation>
@@ -5157,6 +5262,13 @@
<source>The connection is not secure</source>
<translation>La conexi?n no es segura</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Esta conexi?n NO ES SEGURA, pues no est? cifrada.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5249,6 +5361,32 @@
<translation>%1 (no realizado por el error anterior, intente de nuevo %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Solo %1 disponible, se necesita por lo menos %2 para comenzar</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>Imposible abrir o crear la BBDD local de sync. Asegurese de que tiene permisos de escritura en la carpeta de sync.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Poco espacio libre en disco: La descarga lo reducir? por debajo del %1, deberia abortar.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>No hay suficiente espacio libre en el servidor para algunas subidas.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Conflicto sin resolver.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>No se pudo actualizar el archivo: %1</translation>
@@ -5269,22 +5407,6 @@
<translation>No fue posible establecer el registro del archivo a la base de datos local: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Conflicto sin resolver.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Solo %1 disponible, se necesita por lo menos %2 para comenzar</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>Imposible abrir o crear la BBDD local de sync. Asegurese de que tiene permisos de escritura en la carpeta de sync.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Usando archivos virtuales con sufijo, pero el sufijo no est? establecido</translation>
@@ -5304,16 +5426,6 @@
<source>Cannot open the sync journal</source>
<translation>No es posible abrir el diario de sincronizaci?n</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Poco espacio libre en disco: La descarga lo reducir? por debajo del %1, deberia abortar.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>No hay suficiente espacio libre en el servidor para algunas subidas.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5324,7 +5436,7 @@
<translation>No conectado</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>Debe aceptar los t?rminos de servicio</translation>
</message>
@@ -5708,11 +5820,6 @@
<source>Less than a minute</source>
<translation>Hace menos de un minuto</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5720,20 +5827,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1 minuto</numerusform><numerusform>%1 minutos</numerusform><numerusform>%1 minutos</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1 hora</numerusform><numerusform>%1 horas</numerusform><numerusform>%1 horas</numerusform></translation>
@@ -5748,6 +5845,21 @@
<source>%1 days</source>
<translation><numerusform>%1 d?a</numerusform><numerusform>%1 d?as</numerusform><numerusform>%1 d?as</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5890,6 +6002,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Por favor, inicie sesi?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>No hay carpetas configuradas para sincronizar.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Desconectado de %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Versi?n del servidor no soportada</translation>
@@ -5910,31 +6037,6 @@
<translation>Su cuenta %1 requiere que acepte los t?rminos de servicio de su servidor. Ser? redirigido a %2 para indicar que los ha le?do y est? de acuerdo.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Desconectado de %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Desconectado desde cuentas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Cuenta %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Por favor, inicie sesi?n</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>La sincronizaci?n est? deshabilitada</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5956,11 +6058,6 @@
<translation>macOS VFS para %1: Se ha encontrado un problema.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>No hay carpetas configuradas para sincronizar.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Buscando cambios en carpeta remota "%1"</translation>
@@ -5971,6 +6068,21 @@
<translation>Buscando cambios en carpeta local "%1"</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Desconectado desde cuentas:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Cuenta %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>La sincronizaci?n est? deshabilitada</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5979,11 +6091,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>Carpeta &local</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Nombre de usuario</translation>
@@ -6019,22 +6126,11 @@
<translation>Preguntar antes sincronizar carpetas mayores de</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Preguntar antes sincronizar almacenamientos externos</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Elija qu? sincronizar</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Mantener datos locales</translation>
@@ -6049,6 +6145,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Borrar carpeta local e iniciar una sincronizaci?n limpia</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Elija qu? sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>Carpeta &local</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6089,6 +6201,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>en el futuro</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1min</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%nmin</numerusform><numerusform>%nmin</numerusform><numerusform>%nmin</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>ahora</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Hace tiempo</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6129,57 +6286,12 @@
<source>Synced %1</source>
<translation>Sincronizado %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>en el futuro</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>ahora</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1min</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%nmin</numerusform><numerusform>%nmin</numerusform><numerusform>%nmin</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Hace tiempo</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>Las rutas que comienzan con el car?cter '#' no est?n soportadas en el modo VFS.</translation>
@@ -6425,6 +6537,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>Abrir carpetas locales de de grupo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Abrir carpeta local</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Conectado</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>Desconectado</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>Abrir carpeta local "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>Abrir carpeta de grupo "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>Abrir "%1" en el explorador de archivos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>Men? de usuario de carpetas de grupo o locales</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6614,16 +6769,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6638,6 +6783,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6871,16 +7026,16 @@
<translation>Ha ocurrido un error durante la configuraci?n</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Preparando para sincronizar</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>Deteniendo la sincronizaci?n</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Preparando para sincronizar</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>La sincronizaci?n est? en pausa.</translation>
@@ -6939,4 +7094,17 @@
<translation>Liberar espacio local</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>Habilitar sincronizaci?n r?pida</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>La sincronizaci?n r?pida s?lo sincronizar? los cambios en archivos y carpetas dentro de las carpetas que se han explorado. Esto puede incrementar significativamente la capacidad de respuesta en la configuraci?n inicial de los archivos virtuales. Sin embargo, esto provocar? descargas redundantes de archivos movidos a carpetas inexploradas.</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_et.ts nextcloud-desktop-3.16.6/translations/client_et.ts
--- nextcloud-desktop-3.16.4/translations/client_et.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_et.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>Kasuta kiirs?nkroniseerimist</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>Kiirs?nkroniseerimine s?nkroonib vaid nende failide ja kaustade muudatused, millega oled just tegelenud. See v?ib m?rgatavalt parandada reageerimisv?imet virtuaalsete failide algseadistamise ajal. Siiski p?hjustab see liigseid allalaadimisi, kui failid teisaldatalse uurimata kausta. </translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>Kasuta virtuaalsete failide tuge</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation>Luba pr?gikasti sisu kustutamist</translation>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -558,7 +550,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Import rakenduse vanast p?randversioonist</translation>
</message>
@@ -573,7 +565,7 @@
<translation>J?ta vahele</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>Ei ?nnestunud importida kasutajakontosid rakenduse vanast p?randversioonist seadistustest.</translation>
</message>
@@ -581,33 +573,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Andmeruum:?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>M?rkimata kaustad <b>eemaldatakse</b> kohalikust failis?steemist ning neid ei s?nkroniseerita enam sellesse arvutisse</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Loobu</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Rakenda</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>?hendatud <server> kasutajana <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>S?nkrooni k?ik</translation>
@@ -638,6 +608,33 @@
<translation>?henduse seadistused</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Rakenda</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Andmeruum:?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Loobu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>?hendatud <server> kasutajana <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>?htegi kontot pole seadistatud</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>L?biv kr?ptimine virtuaalsete failide jaoks</translation>
@@ -672,9 +669,9 @@
<b>See tegevus on p??rdumatu. Kas oled kindel, et soovid j?tkata?</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>?htegi kontot pole seadistatud</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation>Unusta kr?ptimise seadistus</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -687,6 +684,11 @@
<translation>N?ita mnemofraasi</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation>Kr?ptimine on seadistatud. L?biva kr?ptimise kasutamiseks ?ra unusta soovitud kaustale kr?ptimist lisada. Sellega tagad, et sinna lisatud uued failid on alati l?bivalt kr?ptitud.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>L?biv kr?ptimine on sellel kontol kasutusele v?etud</translation>
@@ -712,6 +714,13 @@
<translation>Kaustas on s?nkroniseerimisviga. Selle kausta kr?ptimine on v?imalik vaid siis, kui s?nkroniseerimine on ?nnestunud</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation>Kuna l?biv kr?ptimine pole seadmes veel kasutusele v?etud, siis sa ei saa seda kausta kr?ptida.
+Kas sa tahaksid l?biva kr?ptimise n??d kasutusele v?tta?</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -736,12 +745,6 @@
<translation>Kausta kr?ptimine ei ?nnestunud, sest teda pole enam olemas.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Ava kaust</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Kr?pti</translation>
@@ -780,16 +783,6 @@
<translation>K?ivita s?nroonimine uuesti</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>J?tka s?nroonimist</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Peata s?nkroonimine</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Eemalda kausta s?nkroniseerimine</translation>
@@ -815,21 +808,11 @@
<translation>Kausta loomine ei ?nnestunud</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Kohaliku kausta loomine ei ?nnestunud <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Kinnita s?nkroniseerimitava kausta eemaldamine</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Kas sa kindlasti soovid l?petada <i>%1</i> kausta s?nkroniseerimise?</p><p><b>M?rkus:</b> See toiming <b>ei</b> kustuta ?htegi faili.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Eemalda kausta s?nkroniseerimine</translation>
@@ -863,24 +846,24 @@
<translation>L?biva kr?ptimise mnemofraas ehk salafraas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>Sinu kr?ptograafilise identiteedi kaitsmiseks me kr?ptime ta 12-s?nalise mnemofraasiga. Palun m?rgi see ?les ning hoia turvaliselt kas moodsas digitaalses salas?nalaekas v?i vana kooli seifis. Seda salafraasi l?heb sul vaja teiste seadmete (n?iteks sinu nutiseade v?i s?learvuti) sidumisel sinu kasutajakontoga.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation>Sinu kr?ptograafilise identiteedi kaitsmiseks me kr?ptime ta 12-s?nalise mnemofraasiga. Palun m?rgi see ?les ning hoia turvaliselt kas moodsas digitaalses salas?nalaekas v?i vana kooli seifis. Seda salafraasi l?heb sul vaja teiste seadmete (n?iteks sinu nutiseade v?i s?learvuti) kr?ptokaustade seadistamisel.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>L?lita l?biv kr?ptimine v?lja</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation>Unusta l?biv kr?ptimine selles seadmes</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>Kas l?litame l?biva kr?ptimise %1 jaoks v?lja?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation>Kas sa soovid ?%1? l?biva kr?ptimise sellest seadmest eemaldada?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>L?biva kr?ptimise kasutamise l?petamisel eemaldatakse siit seadmest kr?ptitud failid.<br>K?ll aga j??vad kr?ptitud failid alles serverisse.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation>L?petades siin seadmes l?biva kr?ptimise kasutamise eemaldatakse siit ka privaatsed andmed ja k?ik k?ik kr?ptitud failid.<br>Aga kr?ptitud failid j??vad serverisse alles ning on kasutatavad neis seadmetes, kus see nii on seadistatud.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -893,34 +876,44 @@
<translation>S?nkroniseerimine on k?imas.<br/>Kas sa soovid seda l?petada?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>Kasutusel on %1 (%3%) / %2. M?nedel kaustadel, sealhulgas v?rgust haagitud andmekogud ja jagatud kaustad, v?ivad olla muud piirangud.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 kasutusel</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>Kasutusel on %1 lubatud mahust %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>Asenda sertifikaat uuega</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Hetkel pole mahu kasutuse info saadaval.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>On kaustu, mille maht on kasvanud ?le %1 MB: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 kasutusel</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation>L?biv kr?ptimine on selle kasutajakonto jaoks teises seadmes sisse l?litatud.<br>Sisesta oma mnemofraas (salafraas) ja kr?ptitud kaustade s?nkroniseerimine siia seadmesse hakkab t??le.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>serveriga %1 kasutajana %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>L?biv kr?ptimine on selle kasutajakonto jaoks teises seadmes sisse l?litatud.<br>Sama saad teha ka selles seadmes, kui sisestad oma mnemofraasi (salafraasi).<br>Seej?rel hakkab toimima ka olemasolevate kr?ptitud kaustade s?nkroniseerimine.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>Serveri versioon %1 pole toetatud! J?tkad omal vastusel.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation>See kasutajakonto v?imaldab l?biva kr?ptimise kasutamist, aga ta peab olema esmalt seadistatud.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>V?ta kr?ptimine kasutusele</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>See konto v?imaldab l?biva kr?ptimise kasutamist</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -938,79 +931,125 @@
<translation>%1 server on hetkel hooldusre?iimis.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>%1 serveri p?ringud on hetkel ?mbersuunatud v?i sinu interneti?hendus asub p??sulehe taga.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>V?lja logitud serverist %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Loon ?hendust serveriga %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>On kaustu, mis on j??nud s?nkroniseerimata, kuna nad on liiga suured:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>Ei ?nnestu luua ?hendust serveriga %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>On kaustu, mis on j??nud s?nkroniseerimata, kuna nad asuvad v?lises andmeruumis:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Serveri seadistusviga: %1 asukohas %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>On kaustu, mis on j??nud s?nkroniseerimata, kuna nad on liiga suured v?i asuvad v?lises andmeruumis:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>Sa pead n?ustuma kasutustingimustega: %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Ava kaust</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>?htegi %1 ?hendust pole seadistatud.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>J?tka s?nroonimist</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>Asenda sertifikaat uuega</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Peata s?nkroonimine</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>On kaustu, mis on j??nud s?nkroniseerimata, kuna nad on liiga suured:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Kohaliku kausta loomine ei ?nnestunud <i>%1</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>On kaustu, mis on j??nud s?nkroniseerimata, kuna nad asuvad v?lises andmeruumis:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Kas sa kindlasti soovid l?petada <i>%1</i> kausta s?nkroniseerimise?</p><p><b>M?rkus:</b> See toiming <b>ei</b> kustuta ?htegi faili.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>On kaustu, mis on j??nud s?nkroniseerimata, kuna nad on liiga suured v?i asuvad v?lises andmeruumis:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>Sinu kr?ptograafilise identiteedi kaitsmiseks me kr?ptime ta 12-s?nalise mnemofraasiga. Palun m?rgi see ?les ning hoia turvaliselt kas moodsas digitaalses salas?nalaekas v?i vana kooli seifis. Seda salafraasi l?heb sul vaja teiste seadmete (n?iteks sinu nutiseade v?i s?learvuti) sidumisel sinu kasutajakontoga.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>On kaustu, mille maht on kasvanud ?le %1 MB: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>L?lita l?biv kr?ptimine v?lja</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>L?biv kr?ptimine on selle kasutajakonto jaoks teises seadmes sisse l?litatud.<br>Sama saad teha ka selles seadmes, kui sisestad oma mnemofraasi (salafraasi).<br>Seej?rel hakkab toimima ka olemasolevate kr?ptitud kaustade s?nkroniseerimine.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>Kas l?litame l?biva kr?ptimise %1 jaoks v?lja?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>See konto v?imaldab l?biva kr?ptimise kasutamist</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>L?biva kr?ptimise kasutamise l?petamisel eemaldatakse siit seadmest kr?ptitud failid.<br>K?ll aga j??vad kr?ptitud failid alles serverisse.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>V?ta kr?ptimine kasutusele</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>Kasutusel on %1 (%3%) / %2. M?nedel kaustadel, sealhulgas v?rgust haagitud andmekogud ja jagatud kaustad, v?ivad olla muud piirangud.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>Kasutusel on %1 lubatud mahust %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Hetkel pole mahu kasutuse info saadaval.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>serveriga %1 kasutajana %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>Serveri versioon %1 pole toetatud! J?tkad omal vastusel.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>%1 serveri p?ringud on hetkel ?mbersuunatud v?i sinu interneti?hendus asub p??sulehe taga.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Loon ?hendust serveriga %1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>Ei ?nnestu luua ?hendust serveriga %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Serveri seadistusviga: %1 asukohas %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>Sa pead n?ustuma kasutustingimustega: %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>?htegi %1 ?hendust pole seadistatud.</translation>
</message>
</context>
<context>
@@ -1125,11 +1164,6 @@
<translation>Sertifikaat ja v?ti (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Sirvi?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Sertifikaadi salas?na:</translation>
@@ -1140,6 +1174,11 @@
<translation>Kuna sertifikaatide koopia salvestub seadistusfailis, siis tungivalt soovitame, et kasutad kr?ptitud pkcs12 sertifikaate.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Sirvi?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Vali sertifikaat</translation>
@@ -1190,34 +1229,34 @@
<translation>J?tka</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 kasutajakontot</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 kasutajakonto</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 kausta</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 kaust</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Import rakenduse vanast p?randversioonist</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1225,12 +1264,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Viga ligip??sul seadistuste failile</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>Ligip??sul seadistustefailile asukohaga ?%1? tekkis viga. Palun kontrolli, et sinu s?steemikontol on ?igus seda faili n?ha.</translation>
</message>
@@ -1272,6 +1311,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation>Peale tuvastamist on fail muutunud</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation>Ei ?nnestunud kustutada ?%1? faili kirjet kohalikust andmebaasist</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation>?%1? faili ei saa alla laadida, sest ta on mittevirtuaalne fail!</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation>Ei ?nnestunud laadida ?%1? faili kohalikust andmebaasist</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation>?%1? faili ei saa alla laadida, sest kr?ptimise teave on puudu.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation>Viga metaandmete uuendamisel: %1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation>?%1? fail on juba kasutusel</translation>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1279,6 +1357,11 @@
<translation>?%1? faili ei saa ?les laadida, sest juba on olemas sama olemusliku nimega fail, kus erinevus on vaid suur- ja v?iket?htedes.</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation>Failinime alguses v?i l?pus on t?hikuid ja tema nime muutmine polnud v?imalik</translation>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>?%1? faili muutmisaeg on vigane. ?ra laadi seda serverisse.</translation>
@@ -1483,7 +1566,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Viga metainfo salvestamisel andmebaasi</translation>
</message>
@@ -1613,21 +1696,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Kas sa soovid <i>?%1?</i> kausta koos kogu oma sisuga j??davalt kustutada?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Kas sa soovid <i>?%1?</i> j??davalt kustutada?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Kinnita kustutamine</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1643,30 +1711,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>?htegi Nextcloudi kontot pole seadistatud</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Kas sa soovid <i>?%1?</i> kausta koos kogu oma sisuga j??davalt kustutada?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Viga autentimisel: Kasutajanimi v?i salas?na on vale</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Kas sa soovid <i>?%1?</i> j??davalt kustutada?</translation>
</message>
<message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Kinnita kustutamine</translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
+ <message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Aegumine</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Sisestatud kasutajatunnused pole ?iged</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>Seadistatud server on selle kliendi jaoks liiga vana</translation>
@@ -1676,16 +1744,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Palun uuenda server viimasele versioonile ning taask?ivita klient.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Viga autentimisel: Kasutajanimi v?i salas?na on vale</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>?htegi Nextcloudi kontot pole seadistatud</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Sisestatud kasutajatunnused pole ?iged</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Viga faili kustutamise katkestamisel</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>Viga ?%1? kustutamise katkestamisel</translation>
</message>
@@ -1693,19 +1776,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Viga serveris: PROPFIND-p?ringu vastus pole XML-vormingus!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>Kr?ptitud meataandmete seadistamise viga!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>Kr?ptitud metaandmete seadistamise viga: serverist saadud esmane allkiri on t?hi.</translation>
</message>
@@ -1713,27 +1796,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Viga ?%1? kausta avamisel</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Kaust pole kliendi poolel k?ttesaadav ?iguste puudumise t?ttu</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Kausta ei leidu: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>Failinime kodeering pole korrektne</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Viga ?%1? kausta lugemisel</translation>
</message>
@@ -1973,11 +2056,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>Pollimise v?rguaadressi alguses puudub https-protokoll, aga sisselogimisaadressi puhul oli ta olemas. Kuna tegemist v?ib olla turvaprobleemiga, siis sisselogimine pole v?imalik. Palun v?ta ?hendust oma peakasutajaga.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>Serveri vastuses leiuduva v?rguaadressi alguses puudub https-protokoll, aga sisselogimisaadressi puhul oli ta olemas. Kuna tegemist v?ib olla turvaprobleemiga, siis sisselogimine pole v?imalik. Palun v?ta ?hendust oma peakasutajaga.</translation>
@@ -1989,28 +2067,33 @@
<translation>Viga serverip?ringu vastuseks: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>Pollimise v?rguaadressi alguses puudub https-protokoll, aga sisselogimisaadressi puhul oli ta olemas. Kuna tegemist v?ib olla turvaprobleemiga, siis sisselogimine pole v?imalik. Palun v?ta ?hendust oma peakasutajaga.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Ligip??sul ?token? otspunktile tekkis viga: <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Serverip?ringu vastuseks saadud JSON-i t??tlemine ei ?nnestunud: <em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>Serverivastuses polnud k?iki eeldatud andmev?lju</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation>Serverist saadetud vastuses polnud k?iki eeldatud v?lju: <br><em>%1</em></translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Serverip?ringu vastuseks saadud JSON-i t??tlemine ei ?nnestunud: <em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2053,6 +2136,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 on eemaldatud.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 on uuendatud.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>?%1? uus nimi on ?%2?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>?%1? uus asukoht on ?%2?.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation><numerusform>?%1? ja %n muu fail on eemaldatud.</numerusform><numerusform>?%1? ja %n muud faili on eemaldatud.</numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>Palun vali muu asukoht. ?%1? kausta pole olemas.</translation>
@@ -2068,17 +2179,6 @@
<translation>Palun vali muu asukoht. ?%1? pole loetav kaust.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 ja %n muud faili on eemaldatud.</numerusform><numerusform>%1 ja %n muud faili on eemaldatud.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 on eemaldatud.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>?%1? ja %n muu fail on lisatud</numerusform><numerusform>?%1? ja %n muud faili on lisatud</numerusform></translation>
@@ -2094,33 +2194,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>?%1? ja %n muud fail on uuendatud.</numerusform><numerusform>?%1? ja %n muud faili on uuendatud.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 on uuendatud.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>?%1? uus nimi on n??d ?%2? ning lisaks on muutunud veel %n faili nimi.</numerusform><numerusform>?%1? uus nimi on n??d ?%2? ning lisaks on muutunud veel %n faili nimi.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>?%1? uus nimi on ?%2?.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>?%1? uus asukoht on n??d ?%2? ning lisaks on teisaldatud veel %n fail.</numerusform><numerusform>?%1? uus asukoht on n??d ?%2? ning lisaks on teisaldatud veel %n faili.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>?%1? uus asukoht on ?%2?.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2134,7 +2217,7 @@
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
- <translation><numerusform>?%1? ja %n muu faili s?nkroniseerimine ei ?nnestunud vigade t?ttu. Lisateavet leiad logist.</numerusform><numerusform>?%1? ja %n muu faili s?nkroniseerimine ei ?nnestunud vigade t?ttu. Lisateavet leiad logist.</numerusform></translation>
+ <translation><numerusform>?%1? ja %n muu faili s?nkroniseerimine ei ?nnestunud vigade t?ttu. Lisateavet leiad logist.</numerusform><numerusform>?%1? ja %n muu faili s?nkroniseerimine ei ?nnestunud vigade t?ttu. Lisateavet leiad logist.</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="494"/>
@@ -2157,68 +2240,68 @@
<translation>S?nkroniseerimise tegevus</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>S?steemi v?ljaj?tmiste faili lugemine eba?nnestus</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Uus kaust, mis on suurem, kui %1 MB on lisatud: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Lisatud on kaust v?liselt andmekandjalt.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Valimaks, kas sa soovid ta alla laadida, ava palun seadistused.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>?ks kaust on ?letanud kaustadele lubatud mahu ?lempiiri %1 MB: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>J?tka s?nkroonimist</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>L?peta s?nkroonimine</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>%1 kaust on ?letanud kaustadele lubatud mahu ?lempiiri %2 MB.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>Kas sa soovid selle kausta s?nkroniseerimise l?petada?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>?%1? kaust on loodud, aga ta oli viimati s?nkroniseerimisest v?listatud ja seega tema sisu hetkel s?nkroniseerimisele ei kuulu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>?%1? fail on loodud, aga ta oli viimati s?nkroniseerimisest v?listatud ja seega hetkel s?nkroniseerimisele ei kuulu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2231,12 +2314,12 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>Virtuaalse faili allalaadimine ei ?nnestunud, tekkis veakood ?%1?, olek ?%2? ja veateade ?%3?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2245,7 +2328,7 @@
Alternatiivina saad k?ik kustutatud failid taastada ?%1? kaustast serverisse uuesti ?leslaadides.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2254,22 +2337,22 @@
Alternatiivina saad nad taasta serverist uuesti allalaadides.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>Kas eemaldame k?ik failid?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>J?tka kustutamisega</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>Taasta failid serverisse</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>Taasta failid serverist</translation>
</message>
@@ -2310,11 +2393,6 @@
<translation>Ei suutnud t?histada kausta olekut</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>Tuvastasin vana s?nkroniseerimislogi ?%1?, kuid selle eemaldamine ei ?nnestunud. Palun veendu, et seda ei kasutaks ?kski rakendus.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(varukoopia)</translation>
@@ -2325,6 +2403,11 @@
<translation> (varukoopia %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>Tuvastasin vana s?nkroniseerimislogi ?%1?, kuid selle eemaldamine ei ?nnestunud. Palun veendu, et seda ei kasutaks ?kski rakendus.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>M??ratlemata olek.</translation>
@@ -2395,16 +2478,6 @@
<translation>S?nkroniseerimisp?ring on katkestatud</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>S?nkroniseerimine on peatatud.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (S?nkroniseerimine on peatatud)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>Palun vali muu asukoht. Valitud kaust pole korrektne kaust.</translation>
@@ -2454,6 +2527,16 @@
Olukorra lahendamiseks palun eemalda ?%1? k?ikide peale ?he kasutajakonto juurest ja lisa neil uus s?nkroniseerimiskaust
Lisateave asjatundjatele: see olukord v?ib olla ka seotud asjaoluga, et ?hes kaustas on mitu mitu s?nkroniseerimise andmebaasi. Palun vaata ?%1? kausta ja otsi kasutamata .sync_*.db faile ning eemalda nad.</translation>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>S?nkroniseerimine on peatatud.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (S?nkroniseerimine on peatatud)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2497,16 +2580,6 @@
<translation>Viga kaustade loendi laadimisel serverist.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Laadin kaustaloendit serverist?</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Leidub lahendamata failikonflikte. Lisateave saamiseks kl?psi.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>Virtuaalsete failide tugi on kasutusel</translation>
@@ -2548,16 +2621,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>Allalaadimine %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>Fail %1 / %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Leidub lahendamata failikonflikte. Lisateave saamiseks kl?psi.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>Allalaadimine %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Laadin kaustaloendit serverist?</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2604,21 +2692,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 / %2, fail %3 / %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>Fail %1 / %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>Ootan %n muu kausta j?rgi?</numerusform><numerusform>Ootan %n muu kausta j?rgi?</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>Alustamas s?nkroniseerimist</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>Ootan %n muu kausta j?rgi?</numerusform><numerusform>Ootan %n muu kausta j?rgi?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2778,11 +2861,6 @@
<translation>?ldised seadistused</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>K?ivita s?steemi startimise&l</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>N?ita k?nede teavitusi</translation>
@@ -2793,11 +2871,6 @@
<translation>S?steemisalve jaoks</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Kasuta ?hev?rvilisi ikoone</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>N?ita vestluste teavitusi</translation>
@@ -2813,17 +2886,32 @@
<translation>T?iendavad seadistused</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>K?si kinnitust enne kaustade s?nkroniseerimist, mis on suuremad, kui</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>K?si kinnitust enne kaustade s?nkroniseerimist, mis asuvad v?lises andmeruumis</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>K?ivita s?steemi startimise&l</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Kasuta ?hev?rvilisi ikoone</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>K?si kinnitust enne kaustade s?nkroniseerimist, mis on suuremad, kui</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>Anna teada, kui kaustade maht kasvab ?le lubatud piiri</translation>
@@ -2834,11 +2922,6 @@
<translation>L?lita s?nkroniseerimine automaatselt v?lja, kui kausta maht ?letab lubatud piiri</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>K?si kinnitust enne kaustade s?nkroniseerimist, mis asuvad v?lises andmeruumis</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>Viska eemaldatavad failid pr?gikasti</translation>
@@ -2890,11 +2973,6 @@
<translation>Uuenduste kanal</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Taask?ivita && Uuenda</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>Kontrolli uuendusi &automaatselt</translation>
@@ -2915,6 +2993,16 @@
<translation>Juriidiline teave</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation>Taasta &vaikeseadistused</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Taask?ivita && Uuenda</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Serveriteavitused, mis vajavad sinu t?helepanu.</translation>
@@ -2935,6 +3023,11 @@
<translation>Kuna kasutusel on s?steemi?lene automaatne k?ivitud, siis rakenduse automaatset k?ivitamist sisselogimisel ei saa v?lja l?litada.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation>Taasta: &%1</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>stabiilne</translation>
@@ -3015,6 +3108,11 @@
<source>Debug archive is created at %1</source>
<translation>Arhiivifail veaotsingu jaoks on loodud asukohta %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation>Enne jagamist eemalda privaatne ja delikaatne teave! Arhiiv on olemas siin: %1</translation>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3179,102 +3277,97 @@
<translation>Uus failinimi</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Muuda failinime</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>?%1? faili s?nkroniseerimine polnud v?imalik, sest failinimes leidub t?hem?rke, mis siin arvutis/seadmes pole lubatud.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>J?rgnevad t?hem?rgid pole siin arvutis/seadmes failide nimedes lubatud: * " | & ? , ; : \ / ~ < > t?hikud alguses ja l?pus</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation>J?rgnevad t?hem?rgid pole siin arvutis/seadmes failide nimedes lubatud: \ / : ? * " < > | t?hikud alguses ja l?pus</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>?%1? faili s?nkroniseerimine polnud v?imalik, sest failinimes leidub t?hem?rke, mis siin serveris pole lubatud.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>J?rgnevad t?hem?rgid pole lubatud: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>J?rgnevad nimede p?hiosad pole lubatud: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>J?rgnevad failinimed pole lubatud: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>J?rgnevad faililaiendid pole lubatud: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Kontrollin nime muutmiseks vajalikke ?igusi?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>Sul puuduvad ?igused selle failinime muutmiseks. Palun autorit, et ta teeks seda.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>Faili?iguste laadimisel tekkis viga %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>Failinime alguses ja l?pus on t?hikuid</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>Failinime alguses on t?hikuid</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>Failinime l?pus on t?hikuid</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>Kasuta vigast failinime</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>Failinimes leidub keelatud t?hem?rke: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>Failinime muutmine ei ?nnestunud. Palun kontrolli, et ?hendus serveriga toimib.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>Kuna sama nimega fail on serveris juba olemas, siis failinime muutmine pole v?imalik. Palun vali m?ni muu nimi.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>Kohaliku faili nime muutmine ei ?nnestunud. %1</translation>
</message>
@@ -3398,16 +3491,6 @@
<translation><p>Uus versioon %1 kliendist on saadaval.</p><p><b>%2</b> on saadaval alla laadimiseks. Paigaldatud on versioon %3.<p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>J?ta seekord vahele</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>V?ta uuendamine ette</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>Uuendamine ei ?nnestunud</translation>
@@ -3432,6 +3515,16 @@
<source>Update manually</source>
<translation>Uuenda k?sitsi</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>J?ta seekord vahele</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>V?ta uuendamine ette</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3456,6 +3549,23 @@
<translation>Proksiserver eeldab autentimist</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Allalaadimise ?lekandekiirus</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Piira</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBaiti/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>M?rkus: kui kasutajakontot hallatakse samas arvutis asuvas serveris, siis proksiserveri seadistused ei ole kasutusel</translation>
@@ -3478,46 +3588,29 @@
<translation>Kasuta ?ldisi seadistusi</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Allalaadimise ?lekandekiirus</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Piiramatu</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBaiti/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Piira</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Piira 3/4 hinnangulise ribalaiusega</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>?leslaadimise ?lekandekiirus</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Piira automaatselt</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>?leslaadimise ?lekandekiirus</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Proksiserveri hostinimi</translation>
@@ -3546,6 +3639,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>Uuenduste kontrollimine eba?nnestus.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Kontrollin uuendusserverit...</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>Uuendus on saadaval: %1</translation>
@@ -3576,11 +3679,6 @@
<translation>Uuenduse allalaadimine ei ?nnestunud. Palun ava %1 ja laadi uuendus k?sitsi alla.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>Uuenduste kontrollimine eba?nnestus.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>Uus %1 on saadaval. Palun ava <a href='%2'>%2</a> ja laadi uuendis alla.</translation>
@@ -3591,16 +3689,21 @@
<translation>Uus %1 on saadaval. Palun ava %2 ja laadi uuendus alla.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Kontrollin uuendusserverit...</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Uuenduse olek on teadmata: Uuendusi ei kontrollitud.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation>Serveris on kasutusel uuenduskanal ?%1?. Kasutad k?ige viimast versiooni.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation>Uuendusi pole saadaval. Kasutad k?ige viimast versiooni.</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Uuendusi pole saadaval. Kasutad k?ige viimast versiooni.</translation>
@@ -3776,11 +3879,6 @@
<translation><font color="green">Edukalt ?hendatud %1: %2 versioon %3 (4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>Vigane v?rguaadress</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>?hendumine eba?nnestus %1 %2-st:<br/>%3</translation>
@@ -3791,6 +3889,16 @@
<translation>P?ringu aegumine proovides luua ?hendust ?%1? teenusega serveris ?%2?.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Server keelab ligip??su. Kontrollimaks omi ?igusi <a href="%1">palun kl?psi siin</a> ja logi teenusesse veebibrauseri vahendusel.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>Vigane v?rguaadress</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Proovin luua ?hendust: %1 / %2?</translation>
@@ -3801,11 +3909,6 @@
<translation>Autenditud p?ring serverisse on ?mbersuunatud siia: ?%1?. Aga kuna server in vigaselt seadistatud, siis tegemist kahjuliku v?rguaadressiga.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Server keelab ligip??su. Kontrollimaks omi ?igusi <a href="%1">palun kl?psi siin</a> ja logi teenusesse veebibrauseri vahendusel.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>Autenditud WebDAV-i p?ringu vastuseks oli vigane vastus</translation>
@@ -4017,62 +4120,34 @@
<translation>Failinimed, mis l?ppevad punktiga pole selles failis?steemis toetatud.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Kaust</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Fail</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation>Kaustanimed, milles leidub t?hem?rk ?%1?, pole selles failis?steemis toetatud.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>Failinimes ?%1? leidub t?hem?rk ?%2?, mis pole selles failis?steemis toetatud.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation>Failinimed, milles leidub t?hem?rk ?%1?, pole selles failis?steemis toetatud.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>Failinimes ?%1? leidub v?hemalt ?ks vigane t?hem?rk</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation>Kaustanimes on v?hemalt ?ks keelatud t?hem?rk</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>Failinimi ?%1? on selles failis?steemis reserveeritud nime staatuses.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>Failinimes on v?hemalt ?ks keelatud t?hem?rk</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation>Kaustanimi on selles failis?steemis reserveeritud nime staatuses.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation>Failinimi on selles failis?steemis reserveeritud nime staatuses.</translation>
</message>
@@ -4082,6 +4157,24 @@
<translation>Failinime l?pus on t?hikuid.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Kaust</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Fail</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>Failinimes ?%1? leidub t?hem?rk ?%2?, mis pole selles failis?steemis toetatud.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4090,6 +4183,16 @@
<translation>Nime muutmine v?i ?leslaadimine ei ?nnestu.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>Failinimes ?%1? leidub v?hemalt ?ks vigane t?hem?rk</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>Failinimi ?%1? on selles failis?steemis reserveeritud nime staatuses.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>Failinime alguses on t?hikuid.</translation>
@@ -4180,64 +4283,74 @@
<translation>Server teatas, et ?%1? puudub</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Vigase muutmisaja t?ttu ei ?nnestunud s?nkroniseerida</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation>?%1? ?leslaadimine on suurem, kui isiklike failide ?%2? vaba ruum.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation>?%1? ?leslaadimine on suurem, kui ?%3? kausta ?%2? vaba ruum.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>Kuna fail on avatud rakenduses ?%1?, siis tema ?leslaadimine pole v?imalik.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>?%1? kirje kustutamisel andmebaasist tekkis viga</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>Teisaldatud vigasesse sihtkohta, taastan andmed</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>Kr?ptitud objekti ei ?nnestu muuta, sest valitud sertifikaat pole kehtiv.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>?Vali, mida s?nkroniseerida? keelunimekirja t?ttu vahele j?etud</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Pole lubatud, kuna sul puuduvad ?igused alamkausta lisamiseks sinna kausta</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Pole lubatud, kuna sul puuduvad ?igused failide lisamiseks sinna kausta</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Pole lubatud ?les laadida, kuna tegemist on serveri poolel ainult-loetava failiga, taastan oleku</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>Eemaldamine pole lubatud, taastan</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Viga andmebaasist lugemisel</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>?%1? kausta lugemisel tekkis serveris viga: %2</translation>
</message>
@@ -4245,38 +4358,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>Ei ?nnestunud kustutada ?%1? faili kohalikust andmebaasist</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>Vigase muutmisaja t?ttu ei ?nnestunud metainfot muuta</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>?%1? kausta ei saa muuta ainult loetavaks: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>tundmatu viga v?i erind</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Viga metaandmete uuendamisel: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>Fail on juba kasutusel</translation>
</message>
@@ -4294,12 +4407,6 @@
<translation>%1 faili ei saa alla laadida, sest kr?ptimise teave on puudu.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>Faili on p?rast avastamist muudetud</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4356,6 +4463,12 @@
<source>The file %1 is currently in use</source>
<translation>?%1? fail on juba kasutusel</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>Faili on p?rast avastamist muudetud</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4373,39 +4486,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>ei saa kustutada faili %1, viga: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>?%1? kausta loomine pole v?imalik, kuna tekiks konflikt kohaliku faili v?i kausta nimega!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>?%1? kausta loomine ei ?nnestunud</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>?%1? kausta ei saa muuta ainult loetavaks: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>tundmatu viga v?i erind</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Viga metaandmete uuendamisel: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>?%1? fail on juba kasutusel</translation>
</message>
@@ -4418,14 +4531,14 @@
<translation>Ei saa eemaldada %1 kuna on konflikt kohaliku faili nimega</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation>Ajutine viga kohaliku objekti kustutamisel, mis oli kustutatud ka serverist.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Ei ?nnestunud kustutada ?%1? faili kirjet kohalikust andmebaasist</translation>
</message>
@@ -4433,49 +4546,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation> ?%1? kausta nime ei saa muuta, kuna tekib konflikt kohaliku kausta v?i failiga!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>?%1? fail on allalaaditud, aga tulemuseks oli konflikt kohaliku failinimega!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>Ei ?nnestunud laadida ?%1? faili kohalikust andmebaasist</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Ei ?nnestunud m??rata PIN-koodi olekut</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Viga metaandmete uuendamisel: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>?%1? fail on juba kasutusel</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>Kausta nime ei olnud v?imalik kaustade hierarhias edasi kanda</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Ei ?nnestunud muuta faili nime</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Ei ?nnestunud kustutada ?%1? faili kirjet kohalikust andmebaasist</translation>
</message>
@@ -4532,39 +4645,39 @@
<translation>Ei saa muuta nime: ?%1? ? ?%2?, tekkis viga ?%3?</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Viga metaandmete uuendamisel: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>?%1? fail on juba kasutusel</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Server saatis vale HTTP koodi. Ootusp?rane kood oli 201, aga saadeti kood "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>Ei ?nnestunud laadida ?%1? faili kohalikust andmebaasist</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Ei ?nnestunud kustutada ?%1? faili kirjet kohalikust andmebaasist</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Ei ?nnestunud m??rata PIN-koodi olekut</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Viga metainfo salvestamisel andmebaasi</translation>
</message>
@@ -4572,22 +4685,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>Kr?ptitud faili ?leslaadimine ei ?nnestunud.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>?%1? faili ei saa ?les laadida, sest juba on olemas sama olemusliku nimega fail, kus erinevus on vaid suur- ja v?iket?htedes.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>?%1? ?leslaadimine ?letab selle kausta kvoodi</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4595,11 +4697,6 @@
<translation>?%1? faili muutmisaeg on vigane. ?ra laadi seda serverisse.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Fail on eemaldatud (?leslaadimise alustamisel): %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Kohalik fail muutus s?nkroniseeringu k?igus. See taastakse.</translation>
@@ -4629,6 +4726,22 @@
<source>The file %1 is currently in use</source>
<translation>?%1? fail on juba kasutusel</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>?%1? ?leslaadimine ?letab selle kausta kvoodi</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>Kr?ptitud faili ?leslaadimine ei ?nnestunud.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Fail on eemaldatud (?leslaadimise alustamisel): %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4877,6 +4990,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Kontekstimen?? jagamine</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Ma jagasin sinuga midagi</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Jagamise valikud</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Saada privaatne link e-kirjaga?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Kopeeri privaatne link l?ikelauale</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>?%1? kausta kr?ptimine ei ?nnestunud</translation>
@@ -4911,43 +5050,17 @@
<translation>J?rgneva kausta kr?ptimine ?nnestus: ?%1?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Kontekstimen?? jagamine</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Vali uus asukoht?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Ma jagasin sinuga midagi</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Jagamise valikud</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Tegevus</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Kopeeri privaatne link l?ikelauale</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Saada privaatne link e-kirjaga?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>Lahku jaoskaustast</translation>
@@ -4963,11 +5076,6 @@
<translation>Selle kausta edasijagamine pole lubatud</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Kopeeri sisemine link</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>Kr?pti</translation>
@@ -4994,12 +5102,6 @@
<translation><numerusform>Aegub %1 minuti p?rast</numerusform><numerusform>Aegub %1 minuti p?rast</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Ava veebilehitsejas</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Lahenda failikonflikt?</translation>
@@ -5029,6 +5131,17 @@
<source>Delete</source>
<translation>Kustuta</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Kopeeri sisemine link</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Ava veebilehitsejas</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5130,13 +5243,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>See ?hendus EI OLE turvaline, kuna see pole kr?pteeritud.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Serveri versioon: %1</translation>
@@ -5156,6 +5262,13 @@
<source>The connection is not secure</source>
<translation>See ?hendus ei ole turvaline</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>See ?hendus EI OLE turvaline, kuna see pole kr?pteeritud.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5248,6 +5361,32 @@
<translation>%1 (j??nud vahele varasema vea t?ttu, j?rgmise katse aeg on %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Vaid ?%1? on saadaval, aga alustamisel on vajalik ?%2?</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>Kohaliku s?nkroniseerimise andmekogu avamine v?i loomine ei ?nnestu. Palun kontrolli, et sinul on s?nkroniseeritavas kaustas kirjutus?igus olemas.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Andmekandjal napib ruumi. Allalaadimised, mis oleks andmeruumi v?hendanud alla %1, j?id vahele.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>M?nede ?leslaadimiste jaoks pole serveris piisavalt vaba andmeruumi.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Lahendamata failikonflikt</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>Faili uuendamine ei ?nnestunud: %1</translation>
@@ -5268,22 +5407,6 @@
<translation>Ei ?nnestunud seadistada faili kirjet kohalikus andmebaasis: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Lahendamata failikonflikt</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Vaid ?%1? on saadaval, aga alustamisel on vajalik ?%2?</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>Kohaliku s?nkroniseerimise andmekogu avamine v?i loomine ei ?nnestu. Palun kontrolli, et sinul on s?nkroniseeritavas kaustas kirjutus?igus olemas.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Kasutan j?relliitega virtuaalseid faile, aga j?relliide on m??ramata</translation>
@@ -5303,16 +5426,6 @@
<source>Cannot open the sync journal</source>
<translation>Ei suuda avada s?nkroniseerimislogi</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Andmekandjal napib ruumi. Allalaadimised, mis oleks andmeruumi v?hendanud alla %1, j?id vahele.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>M?nede ?leslaadimiste jaoks pole serveris piisavalt vaba andmeruumi.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5323,7 +5436,7 @@
<translation>Pole v?rgus</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>Sa pead n?ustuma kasutustingimustega</translation>
</message>
@@ -5479,7 +5592,7 @@
<location filename="../src/libsync/theme.cpp" line="419"/>
<source>%1 Desktop Client Version %2 (%3)</source>
<comment>%1 is application name. %2 is the human version string. %3 is the operating system name.</comment>
- <translation>%1 T??lauaklient, versioon %2 (%3)</translation>
+ <translation>%1i T??lauaklient, versioon %2 (%3)</translation>
</message>
<message>
<location filename="../src/libsync/theme.cpp" line="611"/>
@@ -5707,11 +5820,6 @@
<source>Less than a minute</source>
<translation>V?hem kui minuti p?rast</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation><numerusform>%n minut</numerusform><numerusform>%n minutit</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5719,20 +5827,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation><numerusform>%n tund</numerusform><numerusform>%n tundi</numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1 minuti p?rast</numerusform><numerusform>%1 minuti p?rast</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation><numerusform>%n p?ev</numerusform><numerusform>%n p?eva</numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1 tunni p?rast</numerusform><numerusform>%1 tunni p?rast</numerusform></translation>
@@ -5747,6 +5845,21 @@
<source>%1 days</source>
<translation><numerusform>%1 p?eva p?rast</numerusform><numerusform>%1 p?eva p?rast</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation><numerusform>%n minut</numerusform><numerusform>%n minutit</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n tund</numerusform><numerusform>%n tundi</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n p?ev</numerusform><numerusform>%n p?eva</numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5889,6 +6002,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Palun logi sisse</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>S?nkroniseeritavaid kaustasid pole m??ratud.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Lahti?hendatud %1 kasutajakontost</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Mittetoetatud serveri versioon</translation>
@@ -5909,31 +6037,6 @@
<translation>Sinu ?%1? kasutajakonto eeldab, et n?ustud serveri kasutustingimustega. Suuname sind ?%2? lehele, kus saad kinnitada, et oled tingimusi lugenud ja n?ustud nendega.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Lahti?hendatud %1 kasutajakontost</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Kontodest lahti?hendatud</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Konto %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Palun logi sisse</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Kasutajakontol on s?nkroniseerimine v?lja l?litatud</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5955,11 +6058,6 @@
<translation>macOS VFS %1 jaoks: Tekkis viga.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>S?nkroniseeritavaid kaustasid pole m??ratud.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Kontrollin muudatusi kaugseadmes ?%1?</translation>
@@ -5970,6 +6068,21 @@
<translation>Kontrollin ?%1? muudatusi kohalikus seadmes</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Kontodest lahti?hendatud</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Konto %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Kasutajakontol on s?nkroniseerimine v?lja l?litatud</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5978,11 +6091,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Kohalik kaust</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Kasutajanimi</translation>
@@ -6018,22 +6126,11 @@
<translation>K?si enne luba, kui plaanid s?nkroniseerida kaustu, mis on suuremad kui</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>K?si kinnitust enne kaustade s?nkroniseerimist, mis asuvad v?lises andmeruumis</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Vali, mida s?nkroniseerida</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>S?ilita kohalikud andmed</translation>
@@ -6048,6 +6145,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Kustuta kohaliku kausta sisu ja alusta s?nkroniseerimist t?hja kaustaga</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Vali, mida s?nkroniseerida</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Kohalik kaust</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6088,6 +6201,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%n p</numerusform><numerusform>%n p</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>tulevikus</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%n t</numerusform><numerusform>%n t</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1 min</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%n min</numerusform><numerusform>%n min</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>?sja</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>M?ni aeg tagasi</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6128,57 +6286,12 @@
<source>Synced %1</source>
<translation>S?nkroniseeritud: %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%n p</numerusform><numerusform>%n p</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>tulevikus</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%n t</numerusform><numerusform>%n t</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>kohe</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1 min</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%n min</numerusform><numerusform>%n min</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>M?ni aeg tagasi</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation>Viga faili kustutamisel</translation>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>Asukohad, mille alguses on ?#? pole toetatud virtuaalsete failide re?iimis.</translation>
@@ -6424,6 +6537,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>Ava kohalik v?i grupikaust</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Ava kohalik kaust</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>?hendatud</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>?hendus on katkestatud</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>Ava kohalik kaust ?%1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>Ava grupikaust ?%1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>Ava ?%1? failihalduris</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>Kasutajagruppide ja kohalike kaustade men??</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6613,16 +6769,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6637,6 +6783,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6870,16 +7026,16 @@
<translation>Seadistamisel tekkis viga</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>S?nkroniseerimiseks valmistumine</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>S?nkroniseerimine on peatamisel</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>S?nkroniseerimiseks valmistumine</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>S?nkroniseerimine on peatatud</translation>
@@ -6938,4 +7094,17 @@
<translation>Vabasta andmeruumi</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>Kasuta kiirs?nkroniseerimist</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>Kiirs?nkroniseerimine s?nkroonib vaid nende failide ja kaustade muudatused, millega oled just tegelenud. See v?ib m?rgatavalt parandada reageerimisv?imet virtuaalsete failide algseadistamise ajal. Siiski p?hjustab see liigseid allalaadimisi, kui failid teisaldatalse uurimata kausta. </translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_eu.ts nextcloud-desktop-3.16.6/translations/client_eu.ts
--- nextcloud-desktop-3.16.4/translations/client_eu.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_eu.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>Gaitu sinkronizazio azkarra</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>Sinkronizazio azkarrak arakatu diren karpetetako fitxategietan eta karpeten aldaketak soilik sinkronizatuko ditu. Horrek nabarmen handitu dezake fitxategi birtualen hasierako konfigurazioan erantzuna. Hala ere, esploratu gabeko karpeta batera eramandako fitxategien deskarga erredundanteak eragingo ditu.</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>Gaitu fitxategi birtualak</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -557,7 +549,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Zaharraren inportazioa</translation>
</message>
@@ -572,7 +564,7 @@
<translation>Saltatu</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>Ezin izan dira inportatu kontuak bezero zaharraren konfiguraziotik.</translation>
</message>
@@ -580,33 +572,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Biltegiratze ahalmena: ...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Desmarkatutako karpetak zure bertako fitxategi sistematik <b>ezabatuko</b> dira eta ez dira gehiago ordenagailu honekin sinkronizatuko</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Ezeztatu</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Aplikatu</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation><user> bezala <server>-n konektatuta</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Sinkronizatu dena</translation>
@@ -637,6 +607,33 @@
<translation>Konexioaren ezarpenak</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Aplikatu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Biltegiratze ahalmena: ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Ezeztatu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation><user> bezala <server>-n konektatuta</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Ez da konturik konfiguratu.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>Muturretik muturrerako zifratzea fitxategi birtualekin</translation>
@@ -671,9 +668,9 @@
<b>Prozesu hau ezin da leheneratu. Ziur zaude aurrera egin nahi duzula?</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Ez da konturik konfiguratu.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -686,6 +683,11 @@
<translation>Erakutsi mnemoteknika</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>Muturretik muturrerako zifratzea gaituta dago kontu honetan</translation>
@@ -711,6 +713,12 @@
<translation>Karpetak sinkronizazio errorea dauka. Zifratzea ondo sinkronizatu ostean izango da posible.</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -735,12 +743,6 @@
<translation>Ezin izan da karpeta enkriptatu, karpeta existitzen ez delako</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Ireki karpeta</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Zifratu</translation>
@@ -779,16 +781,6 @@
<translation>Berrabiarazi sinkronizazioa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Berrekin sinkronizazioa</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Gelditu sinkronizazioa</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Ezabatu karpeta honen konexioa</translation>
@@ -814,21 +806,11 @@
<translation>Karpeta sortzeak huts egin du</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Ezin izan da <i>%1</i> bertako karpeta sortu.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Baieztatu Karpetaren Konexioaren Ezabatzea</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Ziur zaude <i>%1</i>karpetaren sinkronizazioa gelditu nahi duzula?</p><p><b>Oharra:</b> Honek <b>ez</b> du fitxategirik ezabatuko.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Ezabatu Karpeta Honen Konexioa</translation>
@@ -862,24 +844,24 @@
<translation>Muturretik muturrerako enkriptatzearen gako mnemoteknikoa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>Zure nortasun kriptografikoa babesteko, hiztegietako 12 hitzen mnemoniko batekin zifratzen dugu. Mesedez, kontuan hartu horiek eta gorde itzazu. Beharrezkoak izango dira zure kontuan beste gailu batzuk gehitzeko (telefono mugikorra edo ordenagailu eramangarria adibidez).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>Desgaitu muturretik muturrerako enkriptatzea</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>%1-ren muturretik muturrerako enkriptatzea desgaitu?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>Muturretik muturrerako enkriptatzea kenduz gero, enkriptatutako lokalean sinkronizatutako fitxategiak kenduko dira.<br>Enkriptatutako fitxategiak zerbitzarian jarraituko dute.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -892,34 +874,44 @@
<translation>Sinkronizazio martxan da.<br/>Bukatu nahi al duzu?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%2-tik %1 (%3%) erabiltzen ari da. Zenbait karpetek, sarean muntatutako edo partekatutako karpetak barne, muga desberdinak izan ditzakete.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 erabiltzen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%2tik %1 erabilita</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Orain ez dago eskuragarri biltegiratze erabileraren informazioa.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>Badira %1MB baino gehiago handitu diren karpetak: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 erabiltzen</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 %2 gisa</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>Muturretik muturrerako zifratzea gaituta dago kontu honetan beste gailu batekin.<br>Zure mnemonikoa sartuz gaitu daiteke gailu honetan.<br>Honek dauden karpeta zifratuen sinkronizazioa gaituko du.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>Zerbitzariko %1 bertsioa ez da onartzen! Zure ardurapean jarraitu.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Konfiguratu zifratzea</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Kontu honek onartzen du muturretik muturrerako zifratzea</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -937,79 +929,125 @@
<translation>%1 zerbitzaria une honetan mantentze lanetan dago.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>Une honetan %1 zerbitzaria birbideratzen ari da, edo zure konexioa atari gatibu baten atzean dago.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>%1etik saioa itxita.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>%1(e)ra konektatzen ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Hainbat karpeta ez dira sinkronizatu handiegiak direlako:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>Ezin izan da %1(e)ra konektatu.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Hainbat karpeta ez dira sinkronizatu kanpoko biltegietan daudelako:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Zerbitzariaren konfigurazio errorea: %1 %2-n.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Hainbat karpeta ez dira sinkronizatu handiegiak direlako edo kanpoko biltegietan daudelako:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Ireki karpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Ez dago %1 konexiorik konfiguratuta.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Berrekin sinkronizazioa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Gelditu sinkronizazioa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Hainbat karpeta ez dira sinkronizatu handiegiak direlako:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Ezin izan da <i>%1</i> bertako karpeta sortu.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Hainbat karpeta ez dira sinkronizatu kanpoko biltegietan daudelako:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Ziur zaude <i>%1</i>karpetaren sinkronizazioa gelditu nahi duzula?</p><p><b>Oharra:</b> Honek <b>ez</b> du fitxategirik ezabatuko.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Hainbat karpeta ez dira sinkronizatu handiegiak direlako edo kanpoko biltegietan daudelako:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>Zure nortasun kriptografikoa babesteko, hiztegietako 12 hitzen mnemoniko batekin zifratzen dugu. Mesedez, kontuan hartu horiek eta gorde itzazu. Beharrezkoak izango dira zure kontuan beste gailu batzuk gehitzeko (telefono mugikorra edo ordenagailu eramangarria adibidez).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>Badira %1MB baino gehiago handitu diren karpetak: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>Desgaitu muturretik muturrerako enkriptatzea</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>Muturretik muturrerako zifratzea gaituta dago kontu honetan beste gailu batekin.<br>Zure mnemonikoa sartuz gaitu daiteke gailu honetan.<br>Honek dauden karpeta zifratuen sinkronizazioa gaituko du.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>%1-ren muturretik muturrerako enkriptatzea desgaitu?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Kontu honek onartzen du muturretik muturrerako zifratzea</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>Muturretik muturrerako enkriptatzea kenduz gero, enkriptatutako lokalean sinkronizatutako fitxategiak kenduko dira.<br>Enkriptatutako fitxategiak zerbitzarian jarraituko dute.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Konfiguratu zifratzea</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%2-tik %1 (%3%) erabiltzen ari da. Zenbait karpetek, sarean muntatutako edo partekatutako karpetak barne, muga desberdinak izan ditzakete.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%2tik %1 erabilita</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Orain ez dago eskuragarri biltegiratze erabileraren informazioa.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 %2 gisa</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>Zerbitzariko %1 bertsioa ez da onartzen! Zure ardurapean jarraitu.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>Une honetan %1 zerbitzaria birbideratzen ari da, edo zure konexioa atari gatibu baten atzean dago.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>%1(e)ra konektatzen ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>Ezin izan da %1(e)ra konektatu.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Zerbitzariaren konfigurazio errorea: %1 %2-n.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Ez dago %1 konexiorik konfiguratuta.</translation>
</message>
</context>
<context>
@@ -1124,11 +1162,6 @@
<translation>Egiaztagiria eta gakoa (pkcs12) :</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Arakatu ...</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Ziurtagiriaren pasahitza:</translation>
@@ -1139,6 +1172,11 @@
<translation>Enkriptatutako pkcs12 sorta biziki gomendagarria da, kopia konfigurazio fitxategian gordeko baita.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Arakatu ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Hautatu ziurtagiri bat</translation>
@@ -1189,34 +1227,34 @@
<translation>Jarraitu</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 kontu</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>Kontu 1</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 karpeta</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>Karpeta 1</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Zaharkitutako inportazioa</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1224,12 +1262,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Errorea ezarpen fitxategia atzitzean</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>Errorea gertatu da %1 konfigurazio fitxategian sartzean. Egiaztatu zure sistemaren kontuak fitxategi hau atzitzeko baimena duela.</translation>
</message>
@@ -1271,6 +1309,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1278,6 +1355,11 @@
<translation>%1 fitxategia ezin da igo izen bereko beste fitxategi bat dagoelako, baina letra maiuskula eta xehe ezberdinekin</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>%1 fitxategiak aldaketa-data baliogabea du. Ez igo hau zerbitzarira.</translation>
@@ -1482,7 +1564,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Errorea metadatuak datu-basean idaztean</translation>
</message>
@@ -1612,21 +1694,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Nahi duzu <i>%1</i> direktorioa eta bere eduki guztia betirako ezabatzea?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Nahi duzu <i>%1</i> fitxategia betirako ezabatzea?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Berretsi ezabaketa</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1642,30 +1709,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Ez dago Nextcloud konturik konfiguratuta</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Nahi duzu <i>%1</i> direktorioa eta bere eduki guztia betirako ezabatzea?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Autentikazio errorea: Erabiltzaile izena edota pasahitza gaizki daude.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Nahi duzu <i>%1</i> fitxategia betirako ezabatzea?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Berretsi ezabaketa</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Denbora-muga</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Emandako kredentzialak ez dira zuzenak</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>Bezero honentzako konfiguratutako zerbitzaria oso zaharra da</translation>
@@ -1675,16 +1742,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Mesedez eguneratu zerbitzarira eta berrabiarazi bezeroa.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Autentikazio errorea: Erabiltzaile izena edota pasahitza gaizki daude.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Ez dago Nextcloud konturik konfiguratuta</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Emandako kredentzialak ez dira zuzenak</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Errore bat gertatu da fitxategi baten ezabatzea bertan behera uztean</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>Errore bat gertatu da %1 ezabatzea bertan behera uztean</translation>
</message>
@@ -1692,19 +1774,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Zerbitzariko errorea: PROPFINDaren erantzunak ez du XML formaturik!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>Zifratutako metadatuen konfigurazio errorea!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>Enkriptatutako metadatuen konfigurazio-errorea: zerbitzariaren hasierako sinadura hutsik dago.</translation>
</message>
@@ -1712,27 +1794,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>%1 direktorioaren irekitzeak huts egin du</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Direktorioa ez dago eskuragarri bezeroan, baimena ukatua</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Direktorioa ez da aurkitu: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>Fitxategiaren kodeketa baliogabea da</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Errorea gertatu da %1 direktorioa irakurtzean</translation>
</message>
@@ -1972,11 +2054,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>Galdeketa URLa ez da HTTPStik hasten nahiz eta saio-hasiera URLa HTTPSrekin hasten den. Saio-hasiera ez da posible izango segurtasun arazoa izan daitekelako. Mesedez, jarri harremanetan zure administratzailearekin.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>Lortutako zerbitzariaren URLa ez da HTTPStik hasten nahiz eta saio-hasiera URLa HTTPSrekin hasten den. Saio-hasiera ez da posible izango segurtasun arazoa izan daitekelako. Mesedez, jarri harremanetan zure administratzailearekin.</translation>
@@ -1988,28 +2065,33 @@
<translation>Zerbitzariak itzuli duen errorea: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>Galdeketa URLa ez da HTTPStik hasten nahiz eta saio-hasiera URLa HTTPSrekin hasten den. Saio-hasiera ez da posible izango segurtasun arazoa izan daitekelako. Mesedez, jarri harremanetan zure administratzailearekin.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Errore bat gertatu da "token" amaierako puntuan sartzean: <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Ezin izan da zerbitzariaren JSON formatuko erantzuna irakurri: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>Zerbitzariaren erantzunak ez ditu espero ziren eremu guztiak</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Ezin izan da zerbitzariaren JSON formatuko erantzuna irakurri: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2052,6 +2134,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ezabatua izan da.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 kargatu da.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 %2-(e)ra berrizendatu da.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 %2-(e)ra mugitu da.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2067,17 +2177,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 eta beste fitxategi %n ezabatu dira.</numerusform><numerusform>%1 eta beste %n fitxategi ezabatu dira.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ezabatua izan da.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 eta beste fitxategi %n gehitu da.</numerusform><numerusform>%1 eta beste %n fitxategi gehitu dira.</numerusform></translation>
@@ -2093,33 +2192,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 eta beste fitxategi %n eguneratu dira.</numerusform><numerusform>%1 eta beste %n fitxategi eguneratu dira.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 kargatu da.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 fitxategiak %2 izen berria hartu du eta beste fitxategi %n berrizendatu da.</numerusform><numerusform>%1 fitxategiak %2 izen berria hartu du eta beste %n fitxategi berrizendatu dira.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 %2-(e)ra berrizendatu da.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 fitxategia %2-ra mugitu da eta beste fitxategi %n mugitu da.</numerusform><numerusform>%1 fitxategia %2-ra mugitu da eta beste %n fitxategi mugitu dira.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 %2-(e)ra mugitu da.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2156,68 +2238,68 @@
<translation>Sinkronizatu Jarduerak</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Ezin izan da sistemako baztertutakoen fitxategia irakurri</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>%1 MB baino handiagoa den karpeta berri bat gehitu da: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Kanpoko biltegi bateko karpeta gehitu da.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Jo ezarpenetara aukeratzeko deskargatu nahi ote duzun.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>Karpeta batek ezarritako %1MB-ko karpeta-tamainaren muga gainditu du: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>Jarraitu sinkronizatzen</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>Utzi sinkronizatzen</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>% 1 karpetak ezarritako % 2MB karpeta-tamainaren muga gainditu du.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>Karpeta hau sinkronizatzeari utzi nahi al diozu?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>%1 karpeta sortu zen baina sinkronizaziotik kanpo ezarri zen. Haren barneko fitxategiak ez dira sinkronizatuko.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>%1 fitxategia sortu zen baina sinkronizaziotik kanpo ezarri zen. Fitxategia ez da sinkronizatuko.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2230,12 +2312,12 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>Fitxategi birtuala deskargatzeak huts egin du "%1" kodea, "%2" egoera eta "%3" errore mezuarekin</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2244,7 +2326,7 @@
Bestela, ezabatutako fitxategi guztiak leheneratu ditzakezu '%1' karpetatik zerbitzarira kargatuz.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2253,22 +2335,22 @@
Bestela, ezabatutako fitxategi guztiak leheneratu ditzakezu zerbitzaritik deskargatuta.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>Fitxategi guztiak ezabatu?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>Ekin ezabaketari</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>Leheneratu fitxategiak zerbitzarian</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>Leheneratu fitxategiak zerbitzaritik</translation>
</message>
@@ -2309,11 +2391,6 @@
<translation>Ezin izan da karpetaren egoera berrezarri</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>"% 1" sinkronizazio egunkari zahar bat aurkitu da, baina ezin izan da kendu. Ziurtatu ez dela aplikaziorik erabiltzen ari.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation> (backup)</translation>
@@ -2324,6 +2401,11 @@
<translation> (backup %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>"% 1" sinkronizazio egunkari zahar bat aurkitu da, baina ezin izan da kendu. Ziurtatu ez dela aplikaziorik erabiltzen ari.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Definitu gabeko egoera.</translation>
@@ -2394,16 +2476,6 @@
<translation>Sinkronizazio eskaera bertan behera utzi da.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Sinkronizazioa pausatuta dago.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (Sinkronizazioa pausatuta dago)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2450,6 +2522,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Sinkronizazioa pausatuta dago.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (Sinkronizazioa pausatuta dago)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2493,16 +2575,6 @@
<translation>Errorea zerbitzaritik karpeten zerrenda eskuratzean.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Karpeta zerrenda zerbitzaritik lortzen...</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Konpondu gabeko gatazkak daude. Klikatu zehaztasunak ikusteko.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>Fitxategi birtualaren laguntza gaituta dago.</translation>
@@ -2544,16 +2616,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>Deskargatu %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>%1. fitxategia %2tik</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Konpondu gabeko gatazkak daude. Klikatu zehaztasunak ikusteko.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>Deskargatu %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Karpeta zerrenda zerbitzaritik lortzen...</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2600,21 +2687,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%2tik %1 , %4tik %3 fitxategi</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>%1. fitxategia %2tik</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>Beste karpeta %n-en zain</numerusform><numerusform>Beste %n karpetaren zain</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>Sinkronizatzen hastear</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>Beste karpeta %n-en zain</numerusform><numerusform>Beste %n karpetaren zain</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2774,11 +2856,6 @@
<translation>Ezarpen orokorrak</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Abiarazi sistema hasterakoan</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>Erakutsi dei jakinarazpenak</translation>
@@ -2789,11 +2866,6 @@
<translation>Sistemaren erretilurako</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Erabili &kolore bakarreko ikonoak</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>Erakutsi txat jakinarazpenak</translation>
@@ -2809,17 +2881,32 @@
<translation>Aurreratua</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Eskatu berrespena ondoko tamaina baino handiagoak diren karpeta berriak sinkronizatu aurretik</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Eskatu baimena kanpoko biltegiak sinkronizatu baino lehen</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Abiarazi sistema hasterakoan</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Erabili &kolore bakarreko ikonoak</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Eskatu berrespena ondoko tamaina baino handiagoak diren karpeta berriak sinkronizatu aurretik</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>Jakinarazi sinkronizatutako karpetak zehaztutako muga baino handiagoak direnean</translation>
@@ -2830,11 +2917,6 @@
<translation>Desgaitu automatikoki muga gainditzen duten karpeten sinkronizazioa</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Eskatu baimena kanpoko biltegiak sinkronizatu baino lehen</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>Eraman kendutako fitxategiak zaborrontzira</translation>
@@ -2886,11 +2968,6 @@
<translation>Eguneratze-kanala</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>Be&rrabiarazi eta Eguneratu</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>&Automatikoki eguneraketak bilatu</translation>
@@ -2911,6 +2988,16 @@
<translation>Lege oharra</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>Be&rrabiarazi eta Eguneratu</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Arreta eskatzen duten zerbitzariaren jakinarazpenak.</translation>
@@ -2931,6 +3018,11 @@
<translation>Ezin da abiarazte automatikoa desgaitu sistema osoaren abiarazte automatikoa gaituta dagoelako.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>egonkorra</translation>
@@ -3011,6 +3103,11 @@
<source>Debug archive is created at %1</source>
<translation>Arazketa fitxategia sortuta dago, hemen: %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3175,102 +3272,97 @@
<translation>Fitxategi-izen berria</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Berrizendatu fitxategia</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>"%1" fitxategia ezin izan da sinkronizatu izenak sistema honetan onartuta ez dauden karaktereak dituelako.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>Hurrengo karaktereak ez daude sisteman onartuta: * " | & ? , ; : \ / ~ < > hasierako/amaierako zuriuneak</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>"%1" fitxategia ezin izan da sinkronizatu izenak zerbitzari honetan onartzen ez diren karaktereak dituelako.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>Hurrengo karaktereak ez dira onartzen: %s</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>Oinarri-izen hauek ez dira onartzen: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>Hurrengo fitxategi-izenak ez dira onartzen: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>Hurrengo fitxategi-luzapenak ez dira onartzen: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Berrizendatze baimenak egiaztatzen ...</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>Ez duzu baimenik fitxategi hau berrizendatzeko. Mesedez, eskatu fitxategiaren jabeari berrizendatzeko.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>Ezin izan dira baimenak eskuratu %1 errorearekin</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>Fitxategi-izenak hasierako eta amaierako zuriuneak dauzka.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>Fitxategi-izenak hasierako zuriunea dauka.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>Fitxategi-izenak amaierako zuriunea dauka.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>Erabili izen baliogabea</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>Fitxategiak karaktere ilegalak dauzka: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>Ezin izan da fitxategia berrizendatu. Mesedez egiaztatu zerbitzarira konektatuta zaudela.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>Ezin da fitxategia berrizendatu izen berdina duen fitxategi bat existitzen delako zerbitzarian dagoeneko. Mesedez, aukeratu beste izen bat.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>Ezin izan da fitxategi lokala berrizendatu. %1</translation>
</message>
@@ -3394,16 +3486,6 @@
<translation><p> %1 bezeroaren bertsio berri bat eskuragarri dago.</p><p><b>%2</b>deskargatzeko prest dago. Instalatuta dagoen bersioa %3 da.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Utzi aldi honetan</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Eskuratu eguneraketa</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>Eguneratzeak huts egin du</translation>
@@ -3428,6 +3510,16 @@
<source>Update manually</source>
<translation>Eguneratu eskuz</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Utzi aldi honetan</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Eskuratu eguneraketa</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3452,6 +3544,23 @@
<translation>Proxy zerbitzariak autentikazioa behar du</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Deskargaren banda zabalera</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Honetara mugatu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KByte/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>Oharra: proxy ezarpenek ez dute eraginik ostalari lokaleko kontuengan</translation>
@@ -3474,46 +3583,29 @@
<translation>Erabili ezarpen orokorrak</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Deskargaren banda zabalera</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Mugarik ez</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KByte/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Honetara mugatu</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Mugatu estimatutako banda zabaleraren 3/4etara</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Igoeraren banda-zabalera</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Automatikoki mugatu</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Igoeraren banda-zabalera</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Proxy zerbitzariaren hostalari izena</translation>
@@ -3542,6 +3634,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>Ezin da eguneraketarik bilatu.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Eguneraketa-zerbitzaria egiaztatzen...</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>%1 eguneraketa berria prest dago</translation>
@@ -3572,11 +3674,6 @@
<translation>Ezin izan da eguneraketa deskargatu. Ireki %1 eguneraketa eskuz deskargatzeko.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>Ezin da eguneraketarik bilatu.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>%1 berria dago eskuragarri. Mesedez, ireki<a href='%2'>%2</a> eguneraketa deskargatzeko.</translation>
@@ -3587,16 +3684,21 @@
<translation>%1 berria dago eskuragarri. Ireki %2 eguneraketa deskargatzeko.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Eguneraketa-zerbitzaria egiaztatzen...</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Eguneraketaren egoera ez da ezaguna. Ez da eguneraketarik bilatu.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Ez dago eguneraketarik eskuragarri. Zure instalazioa azkenengo bertsioa da.</translation>
@@ -3772,11 +3874,6 @@
<translation><font color="green">Konexioa ongi burutu da %1 zerbitzarian: %2 bertsioa %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>Baliogabeko URLa</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Konektatze saiakerak huts egin du %1 at %2:%3 </translation>
@@ -3787,6 +3884,16 @@
<translation>Denbora iraungi da %1era %2n konektatzen saiatzean.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Sarrera zerbitzariarengatik ukatuta. Sarerra egokia duzula egiaztatzeko, egin <a href="%1">klik hemen</a> zerbitzura zure arakatzailearekin sartzeko.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>Baliogabeko URLa</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>%2 zerbitzarian dagoen %1 konektatzen...</translation>
@@ -3797,11 +3904,6 @@
<translation>Zerbitzarira autentifikatutako eskaera "% 1" ra birbideratu da. URLa okerra da, zerbitzaria gaizki konfiguratuta dago.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Sarrera zerbitzariarengatik ukatuta. Sarerra egokia duzula egiaztatzeko, egin <a href="%1">klik hemen</a> zerbitzura zure arakatzailearekin sartzeko.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>Baliogabeko erantzuna jaso du autentifikaturiko WebDAV eskaera batek</translation>
@@ -4013,62 +4115,34 @@
<translation>Puntu batekin amaitzen diren fitxategi-izenak ez dira onartzen fitxategi-sistema honetan.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Karpeta</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Fitxategia</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>"%2" karakterea duen %1 izena ez da onartzen fitxategi-sistema honetan.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>%1 izenak karaktere baliogabe bat du gutxienez</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>%1 izena erreserbatua da fitxategi-sistema honetan.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>Fitxategi izenak behintzat baliogabeko karaktere bat du</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4078,6 +4152,24 @@
<translation>Fitxategi-izenak amaierako zuriunea dauka.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Karpeta</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Fitxategia</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>"%2" karakterea duen %1 izena ez da onartzen fitxategi-sistema honetan.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4086,6 +4178,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>%1 izenak karaktere baliogabe bat du gutxienez</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>%1 izena erreserbatua da fitxategi-sistema honetan.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>Fitxategi-izenak hasierako zuriunea dauka.</translation>
@@ -4176,64 +4278,74 @@
<translation>Zerbitzariak ez du %1-rik jakinarazi</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Ezin da sinkronizatu aldaketa-ordu baliogabea delako</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>Ezin izan da fitxategia kargatu, "%1"(e)n irekita dagoelako.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>Errorea %1 fitxategi erregistroa datu-basetik ezabatzean</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>Baliogabeko helburura mugitu da, berrezartzen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ez ikusi egin zaio, "aukeratu zer sinkronizatu" zerrenda beltzagatik.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Ez da onartu, ez daukazulako baimenik karpeta horretan azpikarpetak gehitzeko</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Ez da onartu, ez daukazulako baimenik karpeta horretan fitxategiak gehitzeko</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Ez dago baimenik fitxategi hau igotzeko zerbitzarian irakurtzeko soilik delako, leheneratzen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>Ezabatzeko baimenik gabe, berrezartzen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Errorea datu-basea irakurtzean</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>Zerbitzariak errore batekin erantzun du "%1" direktorioa irakurtzean: % 2</translation>
</message>
@@ -4241,38 +4353,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>Ezin izan da %1 fitxategia datu-base lokaletik ezabatu</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>Errorea metadatuak eguneratzen aldaketa-data baliogabeagatik</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>%1 karpeta ezin da irakurtzeko soilik bihurtu: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Erorrea metadatuak eguneratzen: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>Fitxategia erabiltzen ari da</translation>
</message>
@@ -4290,12 +4402,6 @@
<translation>Ezin da% 1 fitxategia deskargatu enkriptatze-informazioa falta delako.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>Fitxategia aldatu egin da aurkitu zenetik</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4352,6 +4458,12 @@
<source>The file %1 is currently in use</source>
<translation>%1 fitxategia erabiltzen ari da</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>Fitxategia aldatu egin da aurkitu zenetik</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4369,39 +4481,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>ezin izan da %1 fitxategia ezabatu, errorea: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>Ezin da % 1 karpeta sortu fitxategi lokalaren edo karpetaren izen-talka dela eta!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>Ezin da %1 karpeta sortu</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>%1 karpeta ezin da irakurtzeko soilik bihurtu: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Erorrea metadatuak eguneratzen: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>%1 fitxategia erabiltzen ari da</translation>
</message>
@@ -4414,14 +4526,14 @@
<translation>Ezin izan da %1 kendu fitxategi lokal baten izen gatazka dela eta</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Ezin izan da %1 fitxategiaren erregistroa datu-base lokaletik ezabatu</translation>
</message>
@@ -4429,49 +4541,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>Ezin da % 1 karpeta berrizendatu fitxategi lokalaren edo karpetaren izen-talka dela eta!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>%1 fitxategia deskargatu da, baina fitxategi lokal batekin gatazka du!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>Ezin izan da %1 fitxategia datu-base lokaletik lortu</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Errorea pin egoera ezartzean</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Erorrea metadatuak eguneratzen: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>%1 fitxategia erabiltzen ari da</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>Ezin izan da direktorioen berrizendatzea hedatu hierarkiatik</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Fitxategia berrizendatzeak huts egin du</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Ezin izan da %1 fitxategiaren erregistroa datu-base lokaletik ezabatu</translation>
</message>
@@ -4528,39 +4640,39 @@
<translation>Ezin izan zaio %1-ri %2 izena eman, errorea: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Erorrea metadatuak eguneratzen: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>%1 fitxategia erabiltzen ari da</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>HTTP kode okerra erantzun du zerbitzariak. 201 espero zen, baina "%1 %2" jaso da. </translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>Ezin izan da %1 fitxategia datu-base lokaletik lortu</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Ezin izan da %1 fitxategiaren erregistroa datu-base lokaletik ezabatu</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Errorea pin egoera ezartzean</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Errorea metadatuak datu-basean idaztean</translation>
</message>
@@ -4568,22 +4680,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>Ezin izan da zifratutako fitxategia igo.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>%1 fitxategia ezin da igo izen bereko beste fitxategi bat dagoelako, baina letra maiuskula eta xehe ezberdinekin</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>%1-aren igoerak karpetaren kuota gainditzen du</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4591,11 +4692,6 @@
<translation>%1 fitxategiak aldaketa-data baliogabea du. Ez igo hau zerbitzarira.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Fitxategia kendu da (hasi igoera) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Fitxategi lokala aldatu egin da sinkronizazioa egin bitartean. Berrekin egingo da.</translation>
@@ -4625,6 +4721,22 @@
<source>The file %1 is currently in use</source>
<translation>%1 fitxategia erabiltzen ari da</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>%1-aren igoerak karpetaren kuota gainditzen du</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>Ezin izan da zifratutako fitxategia igo.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Fitxategia kendu da (hasi igoera) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4873,6 +4985,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Testuinguruaren partekatze menua</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Zerbait partekatu dut zurekin</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Partekatze aukerak</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Bidali esteka pribatua postaz...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Kopiatu esteka pribatua arbelera</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>Ezin izan da karpeta zifratu "%1" kokalekuan</translation>
@@ -4907,43 +5045,17 @@
<translation>Hurrengo karpeta ondo zifratu da: "%1"</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Testuinguruaren partekatze menua</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Hautatu kokapen berria ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Zerbait partekatu dut zurekin</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Partekatze aukerak</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Jarduera</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Kopiatu esteka pribatua arbelera</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Bidali esteka pribatua postaz...</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>Utzi partekatze hau</translation>
@@ -4959,11 +5071,6 @@
<translation>Karpeta hau berriro partekatzea ez dago onartuta</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Kopiatu barne esteka</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>Zifratu</translation>
@@ -4990,12 +5097,6 @@
<translation><numerusform>Minutu %1ean iraungiko da</numerusform><numerusform>%1 minututan iraungiko da</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Ireki nabigatzailean</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Ebatzi gatazka ...</translation>
@@ -5025,6 +5126,17 @@
<source>Delete</source>
<translation>Ezabatu</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Kopiatu barne esteka</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Ireki nabigatzailean</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5126,13 +5238,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Konexioa EZ da segurua ez dagoelako enkriptatuta.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Zerbitzariaren bertsioa: %1</translation>
@@ -5152,6 +5257,13 @@
<source>The connection is not secure</source>
<translation>Konexioa ez da segurua</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Konexioa EZ da segurua ez dagoelako enkriptatuta.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5244,6 +5356,32 @@
<translation>%1 (saltatua zena aurreko errore batengatik, berriro saiatzen hemen: %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>%1 bakarrik dago eskuragarri, gutxienez %2 behar da hasteko.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>Ezin izan da ireki edo sortu datu-base lokal sinkronizatua. Ziurtatu idazteko baimena daukazula karpeta sinkronizatu lokalean. </translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Toki gutxi dago diskoan: toki librea %1 azpitik gutxituko zuten deskargak saltatu egin dira.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>Ez dago nahiko toki erabilgarririk zerbitzarian hainbat igoeretarako.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Ebatzi gabeko gatazka.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>Ezin izan da eguneratu fitxategia: % 1</translation>
@@ -5264,22 +5402,6 @@
<translation>Ezin izan da fitxategiaren erregistroa datu-base lokalean ezarri: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Ebatzi gabeko gatazka.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>%1 bakarrik dago eskuragarri, gutxienez %2 behar da hasteko.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>Ezin izan da ireki edo sortu datu-base lokal sinkronizatua. Ziurtatu idazteko baimena daukazula karpeta sinkronizatu lokalean. </translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Suffix erabiltzen da fitxategi birtualak kudeatzeko, baina suffix ez dago konfiguratuta</translation>
@@ -5299,16 +5421,6 @@
<source>Cannot open the sync journal</source>
<translation>Ezin da sinkronizazio egunerokoa ireki</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Toki gutxi dago diskoan: toki librea %1 azpitik gutxituko zuten deskargak saltatu egin dira.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>Ez dago nahiko toki erabilgarririk zerbitzarian hainbat igoeretarako.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5319,7 +5431,7 @@
<translation>Lineaz kanpo</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5703,11 +5815,6 @@
<source>Less than a minute</source>
<translation>Minutu bat baino gutxiago</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5715,20 +5822,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5743,6 +5840,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5885,6 +5997,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Mesedez saioa hasi</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>Ez dago sinkronizazio karpetarik definituta.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>%1etik deskonektatuta</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Ez da zerbitzariaren bertsioa onartzen</translation>
@@ -5905,31 +6032,6 @@
<translation>Zure %1 kontuak zure zerbitzariaren zerbitzuaren baldintzak onartzea eskatzen du. %2-ra birbideratuko zaituzte irakurri duzula eta horrekin ados zaudela aitortzeko.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>%1etik deskonektatuta</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Kontuetatik deskonektatuta:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>%1 Kontua: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Mesedez saioa hasi</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Kontuen sinkronizazioa desgaituta dago</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5951,11 +6053,6 @@
<translation>macOS VFS % 1erako: arazo bat aurkitu da.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>Ez dago sinkronizazio karpetarik definituta.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Urruneko "% 1"-(e)an aldaketarik dagoen egiaztatzen</translation>
@@ -5966,6 +6063,21 @@
<translation>Tokiko "% 1"-(e)an aldaketarik dagoen egiaztatzen</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Kontuetatik deskonektatuta:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>%1 Kontua: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Kontuen sinkronizazioa desgaituta dago</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5974,11 +6086,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>Karpeta &lokala</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Erabiltzaile-izena</translation>
@@ -6014,22 +6121,11 @@
<translation>Eskatu baimena hau baino handiagoak diren karpetak sinkronizatu aurretik</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Eskatu baimena kanpoko biltegiak sinkronizatu baino lehen</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Hautatu zer sinkronizatu</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Mantendu datu lokalak</translation>
@@ -6044,6 +6140,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Ezabatu karpeta lokala eta sinkronizazio garbia egin</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Hautatu zer sinkronizatu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>Karpeta &lokala</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6084,6 +6196,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>etorkizunean</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1m</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>orain</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Duela zenbait denbora</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6124,57 +6281,12 @@
<source>Synced %1</source>
<translation>%1 sinkronizatuta</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>etorkizunean</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>orain</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1m</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Duela zenbait denbora</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>'#' karakterearekin hasten diren bide-izenak ez dira onartzen VFS moduan.</translation>
@@ -6420,6 +6532,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>Ireki tokiko edo taldeko karpetak</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Ireki karpeta lokala</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Konektatuta</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>Deskonektatuta</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>Ireki "% 1" karpeta lokala</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>Ireki taldearen karpeta "% 1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>Ireki %1 fitxategi arakatzailean</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>Erabiltzaileren taldearen eta tokiko karpeten menua</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6609,16 +6764,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6633,6 +6778,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6866,16 +7021,16 @@
<translation>Errore bat gertatu da konfigurazioan</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Sinkronizazioa prestatzen</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>Sinkronizazioa gelditzen ...</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Sinkronizazioa prestatzen</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Sinkronizazioa pausatuta dago</translation>
@@ -6934,4 +7089,17 @@
<translation>Egin leku librea lokalean</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>Gaitu sinkronizazio azkarra</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>Sinkronizazio azkarrak arakatu diren karpetetako fitxategietan eta karpeten aldaketak soilik sinkronizatuko ditu. Horrek nabarmen handitu dezake fitxategi birtualen hasierako konfigurazioan erantzuna. Hala ere, esploratu gabeko karpeta batera eramandako fitxategien deskarga erredundanteak eragingo ditu.</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_fa.ts nextcloud-desktop-3.16.6/translations/client_fa.ts
--- nextcloud-desktop-3.16.4/translations/client_fa.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_fa.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Legacy import</translation>
</message>
@@ -570,7 +562,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Storage space: ?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>???? ??? ????? ???? ?? ????? ???? ???? ??? <b>???</b> ????? ?? ? ???? ?? ??? ???????? ????? ???? ?????? ??.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>????? ???</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>?????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>???? ?? <server> ?? ????? <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>?????????? ???</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Storage space: ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>????? ???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>???? ?? <server> ?? ????? <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>??? ?????????????? ????? ????? ???.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>End-to-end Encryption with Virtual Files</translation>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>??? ?????????????? ????? ????? ???.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation>Display mnemonic</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>End-to-end encryption has been enabled for this account</translation>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -732,12 +740,6 @@
<translation>Could not encrypt folder because the folder does not exist anymore</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>??????? ????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>????????</translation>
@@ -776,16 +778,6 @@
<translation>??? ?????? ???? ????? ????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>?? ??????? ??????????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>???? ????????????? </translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>??? ????? ????? ???? ???? </translation>
@@ -811,21 +803,11 @@
<translation>???? ???? ??????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Could not create local folder <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>????? ??? ????? ????? ???? ????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>??? ??? ????? ?? ?????? ????? ???? ???? <i>1%</i> ?? ????? ???????</p><p><b>????:</b>??? ??? ????? ?? ??? <b>??????</b> ???. </p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>??? ????? ????? ???? ????</translation>
@@ -859,24 +841,24 @@
<translation>End-to-end encryption mnemonic</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>Disable end-to-end encryption</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>Disable end-to-end encryption for %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -889,34 +871,44 @@
<translation>?????? ????? ???? ?? ??? ??????.<br/>??? ???? ????? ?? ?? ????? ?????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>1% (%3%) ?? 2% ?? ???????. ???? ???????? ???? ???? ??? ??? ?? ???? ??? ?????? ???? ??? ??????? ??? ?????? ????? ?????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>1% ?? ???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>1% ?? 2% ?? ???????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>?? ??? ???? ??? ??????? ?????? ????? ???? ?? ????? ????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>There are folders that have grown in size beyond %1MB: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>1% ?? ???????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 as %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>The server version %1 is unsupported! Proceed at your own risk.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Set up encryption</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>??? ???? ?????? ????? ???????? ?????-??-????? ?? ????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -934,79 +926,125 @@
<translation>???? 1% ????? ?? ???? ????? ???.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>Server %1 is currently being redirected, or your connection is behind a captive portal.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>?? 1% ???? ??.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Connecting to %1 ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>????????? ???? ????? ?? ????? ???? ???? ??? ???? ?? ?? ????? ???? ?????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>????????? ???? ????? ?? ????? ???? ???? ??? ???? ?? ?? ????? ????? ?????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Server configuration error: %1 at %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>????????? ???? ????? ?? ????? ???? ???? ??? ???? ?? ?? ????? ???? ?? ????? ????? ?????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>??????? ????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>???? %1 ????? ???????? ???.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>?? ??????? ??????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>???? ????????????? </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>????????? ???? ????? ?? ????? ???? ???? ??? ???? ?? ?? ????? ???? ?????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Could not create local folder <i>%1</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>????????? ???? ????? ?? ????? ???? ???? ??? ???? ?? ?? ????? ????? ?????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>??? ??? ????? ?? ?????? ????? ???? ???? <i>1%</i> ?? ????? ???????</p><p><b>????:</b>??? ??? ????? ?? ??? <b>??????</b> ???. </p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>????????? ???? ????? ?? ????? ???? ???? ??? ???? ?? ?? ????? ???? ?? ????? ????? ?????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>There are folders that have grown in size beyond %1MB: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>Disable end-to-end encryption</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>Disable end-to-end encryption for %1?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>??? ???? ?????? ????? ???????? ?????-??-????? ?? ????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Set up encryption</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>1% (%3%) ?? 2% ?? ???????. ???? ???????? ???? ???? ??? ??? ?? ???? ??? ?????? ???? ??? ??????? ??? ?????? ????? ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>1% ?? 2% ?? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>?? ??? ???? ??? ??????? ?????? ????? ???? ?? ????? ????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 as %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>The server version %1 is unsupported! Proceed at your own risk.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>Server %1 is currently being redirected, or your connection is behind a captive portal.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Connecting to %1 ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Server configuration error: %1 at %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>???? %1 ????? ???????? ???.</translation>
</message>
</context>
<context>
@@ -1121,11 +1159,6 @@
<translation>Certificate & Key (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Browse ?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Certificate password:</translation>
@@ -1136,6 +1169,11 @@
<translation>An encrypted pkcs12 bundle is strongly recommended as a copy will be stored in the configuration file.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Browse ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>?????? ?? ??????????</translation>
@@ -1186,46 +1224,46 @@
<translation>Continue</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>???? ?????? ?? ?????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</translation>
</message>
@@ -1267,6 +1305,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1274,6 +1351,11 @@
<translation>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>File %1 has invalid modified time. Do not upload to the server.</translation>
@@ -1478,7 +1560,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>??? ?? ????? ??????? ?? ?????? ????</translation>
</message>
@@ -1608,21 +1690,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Do you want to delete the directory <i>%1</i> and all its contents permanently?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Do you want to delete the file <i>%1</i> permanently?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Confirm deletion</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1638,30 +1705,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>No Nextcloud account configured</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Do you want to delete the directory <i>%1</i> and all its contents permanently?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>???? ?????: ??? ?????? ?? ??? ???? ?????? ???.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Do you want to delete the file <i>%1</i> permanently?</translation>
</message>
<message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Confirm deletion</translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
+ <message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Timeout</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>????? ????? ??? ???? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>???????? ???? ???? ??? ????? ????? ????? ???.</translation>
@@ -1671,16 +1738,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>???? ?? ????? ???? ?? ??? ????? ???? ? ????? ?? ????? ??? ?????? ??????.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>???? ?????: ??? ?????? ?? ??? ???? ?????? ???.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>No Nextcloud account configured</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>????? ????? ??? ???? ??????</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Error while canceling deletion of a file</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>Error while canceling deletion of %1</translation>
</message>
@@ -1688,19 +1770,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Server error: PROPFIND reply is not XML formatted!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1708,27 +1790,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Error while opening directory %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Directory not accessible on client, permission denied</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Directory not found: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>Filename encoding is not valid</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Error while reading directory %1</translation>
</message>
@@ -1968,11 +2050,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</translation>
@@ -1984,28 +2061,33 @@
<translation>Error returned from the server: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>There was an error accessing the "token" endpoint: <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Could not parse the JSON returned from the server: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>The reply from the server did not contain all expected fields</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Could not parse the JSON returned from the server: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2048,6 +2130,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ??? ??? ???.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ???? ????? ??? ???.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 ?? %2 ????? ??? ???? ??? ???.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 ?? %2 ?????? ???? ??? ???.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2063,17 +2173,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>1% ? n% ?????? ??? ???? ??? ??? ???.</numerusform><numerusform>1% ? n% ?????? ??? ???? ??? ??? ???.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ??? ??? ???.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 and %n other file(s) have been added.</numerusform><numerusform>%1 and %n other file(s) have been added.</numerusform></translation>
@@ -2089,33 +2188,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform> 1% ? n% ?????? ??? ???? ?? ??? ????? ??? ???.</numerusform><numerusform> 1% ? n% ?????? ??? ???? ?? ??? ????? ??? ???.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ???? ????? ??? ???.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>1% ?? 2% ????? ??? ???? ??? ? n% ?????? ??? ???? ????? ??? ???? ??? ???.</numerusform><numerusform>1% ?? 2% ????? ??? ???? ??? ? n% ?????? ??? ???? ????? ??? ???? ??? ???.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 ?? %2 ????? ??? ???? ??? ???.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>1% ?? 2% ????? ??? ? n% ?????? ??? ???? ????? ??? ???.</numerusform><numerusform>1% ?? 2% ????? ??? ? n% ?????? ??? ???? ????? ??? ???.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 ?? %2 ?????? ???? ??? ???.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2152,68 +2234,68 @@
<translation>?????? ????? ????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>??? ???? ?????? ????? ????? ?? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>?? ???? ???? ?????? ?? 1% MB ????? ??? ???: 2%.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>?? ???? ?? ?? ???? ????? ????? ??? ???.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>??? ?? ?????? ??? ?? ?????? ???? ???? ?? ??????? ????? ?? ?? ?? ?????? ????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>A folder has surpassed the set folder size limit of %1MB: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>Keep syncing</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>Stop syncing</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>The folder %1 has surpassed the set folder size limit of %2MB.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>Would you like to stop syncing this folder?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2226,41 +2308,41 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2301,11 +2383,6 @@
<translation>??? ????? ???? ???? ?? ????? ???? ???</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation> (backup)</translation>
@@ -2316,6 +2393,11 @@
<translation> (??????? %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Undefined state.</translation>
@@ -2386,16 +2468,6 @@
<translation>Sync request was cancelled.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>????? ???? ???? ????? ??? ???</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (?????????? ????? ????? ??? ???)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2442,6 +2514,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>????? ???? ???? ????? ??? ???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (?????????? ????? ????? ??? ???)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2485,16 +2567,6 @@
<translation>???? ????? ???????? ???? ??????? ?? ????.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Fetching folder list from server ?</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>????????? ??? ?? ???? ?? ???? ????. ???? ?????? ???? ??????.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>Virtual file support is enabled.</translation>
@@ -2536,16 +2608,31 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>????????? ??? ?? ???? ?? ???? ????. ???? ?????? ???? ??????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>???? ??? ????? ????</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation type="unfinished"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Fetching folder list from server ?</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2592,21 +2679,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>1% ?? 2%? ?????? 3% ?? 4%</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>Waiting for %n other folder(s) ?</numerusform><numerusform>Waiting for %n other folder(s) ?</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>Waiting for %n other folder(s) ?</numerusform><numerusform>Waiting for %n other folder(s) ?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2766,11 +2848,6 @@
<translation>??????? ?????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>??? ??????? ?? ????? ??? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>Show Call Notifications</translation>
@@ -2781,11 +2858,6 @@
<translation>???? ?????? ?????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>??????? ?? ????? ??? ?? ???</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2801,17 +2873,32 @@
<translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Ask for confirmation before synchronizing new folders larger than</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>??????? ????? ??? ?? ????? ???? ????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>??? ??????? ?? ????? ??? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>??????? ?? ????? ??? ?? ???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Ask for confirmation before synchronizing new folders larger than</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>Notify when synchronised folders grow larger than specified limit</translation>
@@ -2822,11 +2909,6 @@
<translation>Automatically disable synchronisation of folders that overcome limit</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>??????? ????? ??? ?? ????? ???? ????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>Move removed files to trash</translation>
@@ -2878,11 +2960,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>??? ?????? ???? ? ?? ??? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation type="unfinished"/>
@@ -2903,6 +2980,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>??? ?????? ???? ? ?? ??? ?????</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>????? ??????? ???? ??????? ????? ?? ????</translation>
@@ -2923,6 +3010,11 @@
<translation>You cannot disable autostart because system-wide autostart is enabled.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>stable</translation>
@@ -2997,6 +3089,11 @@
<source>Debug archive is created at %1</source>
<translation>Debug archive is created at %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3161,102 +3258,97 @@
<translation>New filename</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Rename file</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Checking rename permissions ?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>You don't have the permission to rename this file. Please ask the author of the file to rename it.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>Failed to fetch permissions with error %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>Filename contains leading and trailing spaces.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>Filename contains leading spaces.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>Filename contains trailing spaces.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>Use invalid name</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>Filename contains illegal characters: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>Could not rename file. Please make sure you are connected to the server.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>Could not rename local file. %1</translation>
</message>
@@ -3378,16 +3470,6 @@
<translation><p>?? ???? ???? ?? ????? 1% ?? ????? ???.</p> <p><b>2% </b> ???? ?????? ?? ????? ???. ???? ??? ??? 3% ???. </p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>?????? ????? ??? ????</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>?? ??? ????? ?? ??? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>?????? ????? ???? ????</translation>
@@ -3412,6 +3494,16 @@
<source>Update manually</source>
<translation>??????????? ????</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>?????? ????? ??? ????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>?? ??? ????? ?? ??? ?????</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3436,6 +3528,23 @@
<translation>???? ?????? ??????? ????? ???</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>?????????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>????? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation type="unfinished"/>
@@ -3458,46 +3567,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>?????????? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>???? ???????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>????????</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>????? ??</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>????? ?? 3/4 ????? ???? ????? ??? ???</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>????? ???? ?????</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>????????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>????? ???? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>??? ?????? ???? ??????</translation>
@@ -3526,6 +3618,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>??? ???? ?? ??? ????? ??? ???? ?? ????? ???.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Checking update server ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>New %1 update ready</translation>
@@ -3556,11 +3658,6 @@
<translation>Could not download update. Please open %1 to download the update manually.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>??? ???? ?? ??? ????? ??? ???? ?? ????? ???.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</translation>
@@ -3571,16 +3668,21 @@
<translation>New %1 is available. Please open %2 to download the update.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Checking update server ?</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>????? ?? ??? ????? ?????? ???: ?? ??? ????? ??? ???? ?? ????? ??????.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>?? ??? ????? ????? ????. ??? ??? ????? ???? ???.</translation>
@@ -3756,11 +3858,6 @@
<translation><font color="green"> ?? ?????? ???? ??? ??? ?? %1: %2 ???? %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>???? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>?????? ?????? ?? %1 ?? %2:<br/>%3</translation>
@@ -3771,6 +3868,16 @@
<translation>????? ???? ???? ????? ?? 1% ?? 2% ???? ?? ????? ????.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>?????? ???? ???? ????? ??. ???? ????? ????? ??? ?????? ????? ?????? <a href="%1">????? ?? ???? ???? </a> ?? ?? ?????? ??? ?? ????? ?????? ???? ????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>???? ???????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Trying to connect to %1 at %2 ?</translation>
@@ -3781,11 +3888,6 @@
<translation>The authenticated request to the server was redirected to "%1". The URL is bad, the server is misconfigured.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>?????? ???? ???? ????? ??. ???? ????? ????? ??? ?????? ????? ?????? <a href="%1">????? ?? ???? ???? </a> ?? ?? ?????? ??? ?? ????? ?????? ???? ????.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>There was an invalid response to an authenticated WebDAV request</translation>
@@ -3997,62 +4099,34 @@
<translation>File names ending with a period are not supported on this file system.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>File name contains at least one invalid character</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4062,6 +4136,24 @@
<translation>Filename contains trailing spaces.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4070,6 +4162,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>Filename contains leading spaces.</translation>
@@ -4160,64 +4262,74 @@
<translation>Server reported no %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Cannot sync due to invalid modification time</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>Error while deleting file record %1 from the database</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>Moved to invalid target, restoring</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignored because of the "choose what to sync" blacklist</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Not allowed because you don't have permission to add subfolders to that folder</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Not allowed because you don't have permission to add files in that folder</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Not allowed to upload this file because it is read-only on the server, restoring</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>Not allowed to remove, restoring</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Error while reading the database</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>Server replied with an error while reading directory "%1" : %2</translation>
</message>
@@ -4225,38 +4337,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>Error updating metadata due to invalid modification time</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Error updating metadata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>File is currently in use</translation>
</message>
@@ -4274,12 +4386,6 @@
<translation>File %1 cannot be downloaded because encryption information is missing.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>?????? ?? ???? ??? ????? ???? ???.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4336,6 +4442,12 @@
<source>The file %1 is currently in use</source>
<translation>The file %1 is currently in use</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>?????? ?? ???? ??? ????? ???? ???.</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4353,39 +4465,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>??? ???? ?????? 1% ?? ??? ???: ???? 2%</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>Folder %1 cannot be created because of a local file or folder name clash!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>Could not create folder %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Error updating metadata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>The file %1 is currently in use</translation>
</message>
@@ -4398,14 +4510,14 @@
<translation>1% ????? ?? ?????? ???? ?? ??? ?????? ??? ??? ???</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Could not delete file record %1 from local DB</translation>
</message>
@@ -4413,49 +4525,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>File %1 downloaded but it resulted in a local file name clash!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Error setting pin state</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Error updating metadata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>The file %1 is currently in use</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>Failed to propagate directory rename in hierarchy</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Failed to rename file</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Could not delete file record %1 from local DB</translation>
</message>
@@ -4512,39 +4624,39 @@
<translation>Could not rename %1 to %2, error: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Error updating metadata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>The file %1 is currently in use</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>?? HTTP ?????? ???? ???? ????????? ??. 201 ?????? ?? ???? ??? "1% 2%" ?????? ??.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Could not delete file record %1 from local DB</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Error setting pin state</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>??? ?? ????? ??????? ?? ?????? ????</translation>
</message>
@@ -4552,22 +4664,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>Failed to upload encrypted file.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>?????? 1% ???????? ??? ??? ???? ?????? ????? ?? ??? ?????? ?? ???? ?? ????? ?????? ???? ???? ????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>???????? ?? 1% ??? ?? ????? ???? ???? ???</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4575,11 +4676,6 @@
<translation>File %1 has invalid modification time. Do not upload to the server.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>File Removed (start upload) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>?????? ???? ?? ??? ????? ???? ????? ???. ??? ????? ????? ????.</translation>
@@ -4609,6 +4705,22 @@
<source>The file %1 is currently in use</source>
<translation>The file %1 is currently in use</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>???????? ?? 1% ??? ?? ????? ???? ???? ???</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>Failed to upload encrypted file.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>File Removed (start upload) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4857,6 +4969,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>???????? ????? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>???? ?? ?? ??? ?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>????????? ????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Send private link by email ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>???? ????? ?? ?? ???? ???? ??? ????</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>Failed to encrypt folder at "%1"</translation>
@@ -4891,43 +5029,17 @@
<translation>The following folder was encrypted successfully: "%1"</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>???????? ????? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Select new location ?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>???? ?? ?? ??? ?????????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>????????? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Activity</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>???? ????? ?? ?? ???? ???? ??? ????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Send private link by email ?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>Leave this share</translation>
@@ -4943,11 +5055,6 @@
<translation>??????????? ??? ???? ???? ????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Copy internal link</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>Encrypt</translation>
@@ -4974,12 +5081,6 @@
<translation><numerusform>Expires in %1 minutes</numerusform><numerusform>Expires in %1 minutes</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>??????? ?? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Resolve conflict ?</translation>
@@ -5009,6 +5110,17 @@
<source>Delete</source>
<translation>???</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Copy internal link</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>??????? ?? ??????</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5109,13 +5221,6 @@
<translation>??? ????? ?? ??????? ?? 1% ??? 2% ???????? ??? ???.</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>??? ????? ??? ???? ???? ???????? ???? ???.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Server version: %1</translation>
@@ -5135,6 +5240,13 @@
<source>The connection is not secure</source>
<translation>The connection is not secure</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>??? ????? ??? ???? ???? ???????? ???? ???.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5227,6 +5339,32 @@
<translation>1% (?? ??? ???? ???? ?? ??? ???? ???? ?????? ?? 2% ?????? ????)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>???? 1% ????? ???? ????? 2% ???? ???? ???? ???? ???</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>?????? ???? ???? ??? ?? ????? ??? ???. ??????? ???? ???? ?? ?????? ?? ????? ?? ???? ????? ???? ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>???? ???? ?? ???: ?????????? ?? ???? ???? ?? ?? ???? ?? 1% ???? ?? ???? ?? ?? ????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>???? ???? ?? ???????? ?? ?? ???? ???? ???? ????? ????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>????????? ?? ????.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>Could not update file: %1</translation>
@@ -5247,22 +5385,6 @@
<translation>Could not set file record to local DB: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>????????? ?? ????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>???? 1% ????? ???? ????? 2% ???? ???? ???? ???? ???</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>?????? ???? ???? ??? ?? ????? ??? ???. ??????? ???? ???? ?? ?????? ?? ????? ?? ???? ????? ???? ?????.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Using virtual files with suffix, but suffix is not set</translation>
@@ -5282,16 +5404,6 @@
<source>Cannot open the sync journal</source>
<translation>??? ???? ???? ????? ??? ?? ??? ???</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>???? ???? ?? ???: ?????????? ?? ???? ???? ?? ?? ???? ?? 1% ???? ?? ???? ?? ?? ????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>???? ???? ?? ???????? ?? ?? ???? ???? ???? ????? ????.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5302,7 +5414,7 @@
<translation>Offline</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5686,11 +5798,6 @@
<source>Less than a minute</source>
<translation>Less than a minute</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5698,20 +5805,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5726,6 +5823,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5868,6 +5980,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>???? ???? ????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>??? ??????? ???? ?????????? ????? ???? ???.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>??????? ?? %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>???? ???? ???????? ???? </translation>
@@ -5888,31 +6015,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>??????? ?? %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>??? ??? ?? ???? ??:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>??????????? %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>???? ???? ????</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>????? ???? ???? ??? ???? ???</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5934,11 +6036,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>??? ??????? ???? ?????????? ????? ???? ???.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Checking for changes in remote "%1"</translation>
@@ -5949,6 +6046,21 @@
<translation>Checking for changes in local "%1"</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>??? ??? ?? ???? ??:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>??????????? %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>????? ???? ???? ??? ???? ???</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5957,11 +6069,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&???? ????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Username</translation>
@@ -5997,22 +6104,11 @@
<translation>Ask before syncing folders larger than</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Ask before syncing external storages</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>?????? ????? ??????????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Keep local data</translation>
@@ -6027,6 +6123,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Erase local folder and start a clean sync</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>?????? ????? ??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&???? ????</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6067,6 +6179,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>?? ?????</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1m</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>?????</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>??? ??? ???</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6107,57 +6264,12 @@
<source>Synced %1</source>
<translation>Synced %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>?? ?????</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>?????</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1m</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>??? ??? ???</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6403,6 +6515,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>Open local or group folders</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Open local folder</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Connected</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>Disconnected</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>Open local folder "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>Open group folder "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>Open %1 in file explorer</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>User group and local folders menu</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6592,16 +6747,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6616,6 +6761,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6849,16 +7004,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>?????????? ??????????</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>?????????? ??????????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>??????????? ???? ????? ??? ???</translation>
@@ -6917,4 +7072,17 @@
<translation>Free up local space</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_fi.ts nextcloud-desktop-3.16.6/translations/client_fi.ts
--- nextcloud-desktop-3.16.4/translations/client_fi.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_fi.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
@@ -570,7 +562,7 @@
<translation>Ohita</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Tallennustila: ...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Ilman valintaa olevat kansiot <b>poistetaan</b> paikallisesta tiedostoj?rjestelm?st?, eik? niit? synkronoida en?? jatkossa t?m?n tietokoneen kanssa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Peruuta</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Toteuta</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Yhdistetty palvelimeen <server> k?ytt?en tunnusta <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Synkronoi kaikki</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Toteuta</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Tallennustila: ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Peruuta</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Yhdistetty palvelimeen <server> k?ytt?en tunnusta <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Tili? ei ole m??ritelty.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation type="unfinished"/>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Tili? ei ole m??ritelty.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation>N?yt? avainkoodi</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>P??st? p??h?n -salaus on k?yt?ss? t?ll? tilill?</translation>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -730,12 +738,6 @@
<translation>Kansiota ei voida salata, koska sit? ei ole en?? olemassa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Avaa kansio</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Salaus</translation>
@@ -774,16 +776,6 @@
<translation>K?ynnist? synkronointi uudelleen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Palauta synkronointi</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Keskeyt? synkronointi</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Poista kansion synkronointiyhteys</translation>
@@ -809,21 +801,11 @@
<translation>Kansion luominen ep?onnistui</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Ei voitu luoda paikallista kansiota <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Vahvista kansion synkronointiyhteyden poisto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Haluatko varmasti lopettaa kansion <i>%1</i> synkronoinnin?</p><p><b>Huomio:</b> T?m? toimenpide <b>ei</b> poista mit??n tiedostoja.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Poista kansion synkronointiyhteys</translation>
@@ -857,23 +839,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>Poista p??st? p??h?n -salaus k?yt?st?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -887,34 +869,44 @@
<translation>Synkronointioperaatio on meneill??n.<br/>Haluatko keskeytt?? sen?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1/%2 (%3 %) k?yt?ss?. Jotkin kansiot, mukaan lukien verkkojaot ja jaetut kansiot, voivat sis?lt?? eri rajoitukset.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 k?yt?ss?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1/%2 k?yt?ss?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Tallennustilan k?ytt?tietoja ei ole juuri nyt saatavilla.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 k?yt?ss?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>Palvelimen versiota %1 ei tueta! Jatka omalla vastuulla.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Aseta salaus</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>T?m? tili tukee p??st? p??h?n -salausta</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -932,79 +924,125 @@
<translation>Palvelin %1 on parhaillaan huoltotilassa.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Kirjauduttu ulos kohteesta %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Yhdistet??n kohteeseen %1 ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Havaittiin kansioita, joita ei synkronoitu, koska ne ovat kooltaan liian suuria:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Seuraavia kansioita ei synkronoitu, koska ne sijaitsevat ulkoisella tallennustilalla:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Palvelimen kokoonpanovirhe: %1 at %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Seuraavia kansioita ei synkronoitu, koska ne ovat liian suuria tai ulkoisia tallennustiloja:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Avaa kansio</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Palauta synkronointi</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Keskeyt? synkronointi</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Ei voitu luoda paikallista kansiota <i>%1</i>.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Haluatko varmasti lopettaa kansion <i>%1</i> synkronoinnin?</p><p><b>Huomio:</b> T?m? toimenpide <b>ei</b> poista mit??n tiedostoja.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>%1-yhteytt? ei ole m??ritelty.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>Poista p??st? p??h?n -salaus k?yt?st?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Havaittiin kansioita, joita ei synkronoitu, koska ne ovat kooltaan liian suuria:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Seuraavia kansioita ei synkronoitu, koska ne sijaitsevat ulkoisella tallennustilalla:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1/%2 (%3 %) k?yt?ss?. Jotkin kansiot, mukaan lukien verkkojaot ja jaetut kansiot, voivat sis?lt?? eri rajoitukset.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Seuraavia kansioita ei synkronoitu, koska ne ovat liian suuria tai ulkoisia tallennustiloja:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1/%2 k?yt?ss?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Tallennustilan k?ytt?tietoja ei ole juuri nyt saatavilla.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>Palvelimen versiota %1 ei tueta! Jatka omalla vastuulla.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>T?m? tili tukee p??st? p??h?n -salausta</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Yhdistet??n kohteeseen %1 ?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Aseta salaus</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Palvelimen kokoonpanovirhe: %1 at %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>%1-yhteytt? ei ole m??ritelty.</translation>
</message>
</context>
<context>
@@ -1119,11 +1157,6 @@
<translation>Varmenne & avain (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Selaa?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Sertifikaatin salasana:</translation>
@@ -1134,6 +1167,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Selaa?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Valitse varmenne</translation>
@@ -1184,46 +1222,46 @@
<translation>Jatka</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 tili?</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 tili</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 kansiota</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 kansio</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Asetustiedostoa ei voitu k?ytt??</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation type="unfinished"/>
</message>
@@ -1265,6 +1303,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1272,6 +1349,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
@@ -1476,7 +1558,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
</message>
@@ -1606,21 +1688,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Haluatko poistaa kansion <i>%1</i> ja sen sis?ll?n pysyv?sti?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Haluatko poistaa tiedoston <i>%1</i> pysyv?sti?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Vahvista poistaminen</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1636,30 +1703,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Nextcloud-tili? ei ole m??ritelty</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Haluatko poistaa kansion <i>%1</i> ja sen sis?ll?n pysyv?sti?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Tunnistautumisvirhe: k?ytt?j?tunnus tai salasana on v??rin.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Haluatko poistaa tiedoston <i>%1</i> pysyv?sti?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Vahvista poistaminen</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Aikakatkaisu</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Annetut tilitiedot eiv?t ole oikein</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>M??ritelty palvelin on ohjelmistoversioltaan liian vanha t?lle asiakasohjelmistolle</translation>
@@ -1669,16 +1736,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>P?ivit? uusimpaan palvelinversioon ja k?ynnist? asiakasohjelmisto uudelleen.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Tunnistautumisvirhe: k?ytt?j?tunnus tai salasana on v??rin.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Nextcloud-tili? ei ole m??ritelty</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Annetut tilitiedot eiv?t ole oikein</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Virhe tiedoston poiston perumisessa</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>Virhe kohteen %1 poiston perumisessa</translation>
</message>
@@ -1686,19 +1768,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Palvelinvirhe: PROPFIND-vastaus ei ole XML-formaatissa!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1706,27 +1788,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Virhe kansion %1 avaamisessa</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Kansioon ei ole k?ytt?oikeutta</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Kansiota ei l?ytynyt: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>Tiedostonimen merkkikoodaus ei ole kelvollinen</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Virhe kansion %1 luvussa</translation>
</message>
@@ -1966,11 +2048,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
@@ -1982,28 +2059,33 @@
<translation>Palvelun palautti virheen: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Palvelimen palauttamaa JSON:ia ei voitu j?sent??: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>Vastaus palvelimelta ei sis?lt?nyt kaikkia odotettuja kentti?</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Palvelimen palauttamaa JSON:ia ei voitu j?sent??: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2046,6 +2128,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 on poistettu.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 on p?ivitetty.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 on nimetty uudeelleen muotoon %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 on siirretty kohteeseen %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2061,17 +2171,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 ja %n muu tiedosto on poistettu.</numerusform><numerusform>%1 ja %n muuta tiedostoa on poistettu.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 on poistettu.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 ja %n muuta tiedostoa on lis?tty.</numerusform><numerusform>%1 ja %n muuta tiedostoa on lis?tty.</numerusform></translation>
@@ -2087,33 +2186,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 ja %n muu tiedosto on p?ivitetty.</numerusform><numerusform>%1 ja %n muuta tiedostoa on p?ivitetty.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 on p?ivitetty.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 on nimetty uudelleen nimell? %2 ja %n muuta tiedostoa on uudelleennimetty.</numerusform><numerusform>%1 on nimetty uudelleen nimell? %2 ja %n muuta tiedostoa on uudelleennimetty.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 on nimetty uudeelleen muotoon %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 on siirretty kohteeseen %2 ja %n muuta tiedostoa on siirretty.</numerusform><numerusform>%1 on siirretty kohteeseen %2 ja %n muuta tiedostoa on siirretty.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 on siirretty kohteeseen %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2150,67 +2232,67 @@
<translation>Synkronointiaktiviteetti</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Uusi kansio kooltaan yli %1 Mt on lis?tty: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Kansio erillisest? tallennustilasta on lis?tty.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Jos haluat ladata sen, valitse kansio asetuksista.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2219,41 +2301,41 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2294,11 +2376,6 @@
<translation>Kansion tilaa ei voitu alustaa</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation> (varmuuskopio)</translation>
@@ -2309,6 +2386,11 @@
<translation> (varmuuskopio %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation type="unfinished"/>
@@ -2379,16 +2461,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Synkronointi on keskeytetty.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (Synkronointi on keskeytetty)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2435,6 +2507,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Synkronointi on keskeytetty.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (Synkronointi on keskeytetty)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2478,16 +2560,6 @@
<translation>Virhe ladatessa kansiolistausta palvelimelta.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Noudetaan kansiolistausta palvelimelta?</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Selvitt?m?tt?mi? ristiriitoja. Napsauta n?hd?ksesi tiedot.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>Virtuaalitiedostojen tuki on k?yt?ss?.</translation>
@@ -2529,16 +2601,31 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Selvitt?m?tt?mi? ristiriitoja. Napsauta n?hd?ksesi tiedot.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation type="unfinished"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Noudetaan kansiolistausta palvelimelta?</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2585,21 +2672,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1/%2, tiedosto %3/%4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>Odotetaan %n muuta kansiota ...</numerusform><numerusform>Odotetaan %n muuta kansiota ...</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>Odotetaan %n muuta kansiota ...</numerusform><numerusform>Odotetaan %n muuta kansiota ...</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2759,11 +2841,6 @@
<translation>Yleisasetukset</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&K?ynnist? j?rjestelm?n k?ynnistyess?</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation type="unfinished"/>
@@ -2774,11 +2851,6 @@
<translation>Ilmoitusalueelle</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>K?yt? &mustavalkoisia kuvakkeita</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2794,17 +2866,32 @@
<translation>Lis?asetukset</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>Mt</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Kysy vahvistus ennen kuin erilliset tallennustilat synkronoidaan</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&K?ynnist? j?rjestelm?n k?ynnistyess?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>K?yt? &mustavalkoisia kuvakkeita</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2815,11 +2902,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Kysy vahvistus ennen kuin erilliset tallennustilat synkronoidaan</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2871,11 +2953,6 @@
<translation>P?ivityskanava</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&K?ynnist? uudelleen && p?ivit?</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>Tarkista p?ivitykset &automaattisesti</translation>
@@ -2896,6 +2973,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&K?ynnist? uudelleen && p?ivit?</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Palvelinilmoitukset jotka vaativat huomiota.</translation>
@@ -2916,6 +3003,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>vakaa</translation>
@@ -2990,6 +3082,11 @@
<source>Debug archive is created at %1</source>
<translation>Vianetsint?tietodot koostettu kohteeseen %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3154,102 +3251,97 @@
<translation>Uusi tiedostonimi</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Nime? tiedosto uudelleen</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Tarkistetaan oikeudet nimet? uudelleen?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>Sinulla ei ole k?ytt?oikeutta t?m?n tiedoston uudelleennime?miseen. Pyyd? tiedoston omistajaa nime?m??n se uudelleen.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>Tiedostonimi sis?lt?? v?lily?ntej? alussa ja lopussa.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>Tiedostonimi sis?lt?? v?lily?ntej? alussa.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>Tiedostonimi sis?lt?? v?lily?ntej? lopussa.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>Tiedostonimi sis?lt?? kiellettyj? merkkej?: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>Tiedostoa ei voitu nimet? uudelleen. Varmista, ett? olet yhteydess? palvelimeen.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>Tiedostoa ei voitu nimet? uudelleen, koska saman niminen tiedosto on jo palvelimella. Valitse uusi nimi.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>Paikallista tiedostoa ei voitu nimet? uudelleen. %1</translation>
</message>
@@ -3370,16 +3462,6 @@
<translation><p>Uusi versio %1-asiakasohjelmistosta on saatavilla.</p><p><b>%2</b> on ladattavissa. Asennettu versio on %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Ohita t?m?n kerran</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>P?ivit?</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>P?ivitys ep?onnistui</translation>
@@ -3404,6 +3486,16 @@
<source>Update manually</source>
<translation>P?ivit? manuaalisesti</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Ohita t?m?n kerran</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>P?ivit?</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3428,6 +3520,23 @@
<translation>V?lityspalvelin vaatii tunnistautumisen</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Latauskaista</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Rajoita</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>kilotavua/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation type="unfinished"/>
@@ -3450,46 +3559,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Latauskaista</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Ei rajoitusta</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>kilotavua/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Rajoita</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Rajoita 3/4:aan arvioidusta kaistanleveydest?</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>L?hetyskaista</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Rajoita automaattisesti</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>L?hetyskaista</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>V?lityspalvelinkoneen nimi</translation>
@@ -3518,6 +3610,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>P?ivitysten tarkistus ep?onnistui.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Tarkistetaan p?ivityspalvelinta?</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>Uusi %1-p?ivitys valmiina</translation>
@@ -3548,11 +3650,6 @@
<translation>P?ivityksen lataus ep?onnistui. Avaa %1 ladataksesi p?ivityksen manuaalisesti.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>P?ivitysten tarkistus ep?onnistui.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>Uusi %1 on saatavilla. Avaa <a href='%2'>%2</a> ladataksesi p?ivityksen.</translation>
@@ -3563,16 +3660,21 @@
<translation>Uusi %1 on saatavilla. Avaa %2 ladataksesi p?ivityksen.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Tarkistetaan p?ivityspalvelinta?</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>P?ivityksen tila on tuntematon: uusia p?ivityksi? ei tarkistettu.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>P?ivityksi? ei ole saatavilla. K?yt?ss?si on uusin versio.</translation>
@@ -3748,11 +3850,6 @@
<translation><font color="green">Muodostettu yhteys onnistuneesti kohteeseen %1: %2 versio %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>Virheellinen verkko-osoite</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Yhteys %1iin osoitteessa %2 ep?onnistui:<br/>%3</translation>
@@ -3763,6 +3860,16 @@
<translation>Aikakatkaisu yritt?ess? yhteytt? kohteeseen %1 osoitteessa %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Palvelin esti k?ytt?misen. Vahvista k?ytt?oikeutesi palvelimeen <a href="%1">napsauttamalla t?st?</a> ja kirjaudu palveluun selaimella.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>Virheellinen verkko-osoite</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation type="unfinished"/>
@@ -3773,11 +3880,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Palvelin esti k?ytt?misen. Vahvista k?ytt?oikeutesi palvelimeen <a href="%1">napsauttamalla t?st?</a> ja kirjaudu palveluun selaimella.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation type="unfinished"/>
@@ -3983,62 +4085,34 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>Tiedoston nimi sis?lt?? ainakin yhden virheellisen merkin</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4048,6 +4122,24 @@
<translation>Tiedostonimi sis?lt?? v?lily?ntej? lopussa.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4056,6 +4148,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>Tiedostonimi sis?lt?? v?lily?ntej? alussa.</translation>
@@ -4146,64 +4248,74 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Ei voida synkronoida virheellisen muokkausajan vuoksi</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Ei sallittu, koska oikeutesi eiv?t riit? alikansioiden lis??miseen kyseiseen kansioon</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Ei sallittu, koska k?ytt?oikeutesi eiv?t riit? tiedostojen lis??miseen kyseiseen kansioon</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Virhe tietokantaa luettaessa</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation type="unfinished"/>
</message>
@@ -4211,38 +4323,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Virhe metatietoja p?ivitt?ess?: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>Tiedosto on t?ll? hetkell? k?yt?ss?</translation>
</message>
@@ -4260,12 +4372,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>Tiedosto on muuttunut l?ytymisen j?lkeen</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4322,6 +4428,12 @@
<source>The file %1 is currently in use</source>
<translation>Tiedosto %1 on t?ll? hetkell? k?yt?ss?</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>Tiedosto on muuttunut l?ytymisen j?lkeen</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4339,39 +4451,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>ei voitu poistaa tiedostoa %1, virhe: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>Ei voitu luoda kansiota %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Virhe metatietoja p?ivitt?ess?: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>Tiedosto %1 on t?ll? hetkell? k?yt?ss?</translation>
</message>
@@ -4384,14 +4496,14 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4399,49 +4511,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Virhe metatietoja p?ivitt?ess?: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>Tiedosto %1 on t?ll? hetkell? k?yt?ss?</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Tiedoston uudelleennime?minen ep?onnistui</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4498,39 +4610,39 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Virhe metatietoja p?ivitt?ess?: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>Tiedosto %1 on t?ll? hetkell? k?yt?ss?</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>HTTP-palvelin palautti v??r?n koodin. Odotettiin koodia 201, vastaanotettiin "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
</message>
@@ -4538,22 +4650,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>Salatun tiedoston l?hett?minen ep?onnistui.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4561,11 +4662,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Paikallinen tiedosto muuttui synkronoinnin aikana. Jatketaan.</translation>
@@ -4595,6 +4691,22 @@
<source>The file %1 is currently in use</source>
<translation>Tiedosto %1 on t?ll? hetkell? k?yt?ss?</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>Salatun tiedoston l?hett?minen ep?onnistui.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4843,6 +4955,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Jaoin jotain kanssasi</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Jakamisen valinnat</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>L?het? yksityinen linkki s?hk?postitse?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Kopioi yksityinen linkki leikep?yd?lle</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4875,43 +5013,17 @@
<translation>Seuraava kansio salattiin: "%1"</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Valitse uusi sijainti?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Jaoin jotain kanssasi</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Jakamisen valinnat</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Kopioi yksityinen linkki leikep?yd?lle</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>L?het? yksityinen linkki s?hk?postitse?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4927,11 +5039,6 @@
<translation>T?m?n kansion uudelleenjakaminen ei ole sallittu</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Kopioi sis?inen linkki</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>Salaa</translation>
@@ -4958,12 +5065,6 @@
<translation><numerusform>Vanhenee %1 minuutin kuluttua</numerusform><numerusform>Vanhenee %1 minuutin kuluttua</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Avaa selaimessa</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Selvit? virhetilanne ?</translation>
@@ -4993,6 +5094,17 @@
<source>Delete</source>
<translation>Poista</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Kopioi sis?inen linkki</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Avaa selaimessa</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5094,13 +5206,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Yhteys EI OLE turvallinen, koska sit? ei ole salattu.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Palvelimen versio: %1</translation>
@@ -5120,6 +5225,13 @@
<source>The connection is not secure</source>
<translation>T?m? yhteys ei ole turvallinen</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Yhteys EI OLE turvallinen, koska sit? ei ole salattu.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5212,6 +5324,32 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Vain %1 on k?ytett?viss?, k?ynnistymiseen tarvitaan %2</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Levytila on v?hiss?. Lataukset, jotka pienent?isiv?t tilaa alle %1 ohitettiin.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>Palvelimella on liian v?h?n tilaa joillekin latauksille.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Selvitt?m?t?n ristiriita.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>Tiedostoa ei voitu p?ivitt??: %1</translation>
@@ -5232,22 +5370,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Selvitt?m?t?n ristiriita.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Vain %1 on k?ytett?viss?, k?ynnistymiseen tarvitaan %2</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
@@ -5267,16 +5389,6 @@
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Levytila on v?hiss?. Lataukset, jotka pienent?isiv?t tilaa alle %1 ohitettiin.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>Palvelimella on liian v?h?n tilaa joillekin latauksille.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5287,7 +5399,7 @@
<translation>Offline</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5671,11 +5783,6 @@
<source>Less than a minute</source>
<translation>Alle minuutti</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5683,20 +5790,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5711,6 +5808,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5853,6 +5965,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Kirjaudu sis??n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>Synkronointikansioita ei ole m??ritelty.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Katkaise yhteys kohteeseen %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Palvelimen versio ei ole tuettu</translation>
@@ -5873,31 +6000,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Katkaise yhteys kohteeseen %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Katkaistu yhteys tileihin:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Tili %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Kirjaudu sis??n</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Tilin synkronointi on poistettu k?yt?st?</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5919,11 +6021,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>Synkronointikansioita ei ole m??ritelty.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation type="unfinished"/>
@@ -5934,6 +6031,21 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Katkaistu yhteys tileihin:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Tili %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Tilin synkronointi on poistettu k?yt?st?</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5942,11 +6054,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Paikallinen kansio</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>K?ytt?j?tunnus</translation>
@@ -5982,22 +6089,11 @@
<translation>Varmista ennen kuin synkronoidaan kansioita, jotka ovat suurempia kuin</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>Mt</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Kysy ennenkuin synkronoidaan ulkoisia tallennustiloja</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Valitse synkronoitavat tiedot</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Pid? paikalliset tiedostot</translation>
@@ -6012,6 +6108,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Tyhjenn? paikallinen kansio ja aloita synkronointi uudestaan</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>Mt</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Valitse synkronoitavat tiedot</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Paikallinen kansio</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6052,6 +6164,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>tulevaisuudessa</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>nyt</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Jokin aika sitten</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6092,57 +6249,12 @@
<source>Synced %1</source>
<translation>Synkronoitu %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>tulevaisuudessa</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>nyt</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Jokin aika sitten</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6388,6 +6500,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Avaa paikallinen kansio</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Yhdistetty</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>Yhteys katkaistu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6577,16 +6732,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 t</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 Gt</translation>
@@ -6601,6 +6746,16 @@
<source>%L1 KB</source>
<translation>%L1 kt</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 t</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6834,16 +6989,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Valmistaudutaan synkronointiin</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Valmistaudutaan synkronointiin</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Synkronointi on keskeytetty</translation>
@@ -6902,4 +7057,17 @@
<translation>Vapauta paikallista tilaa</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_fr.ts nextcloud-desktop-3.16.6/translations/client_fr.ts
--- nextcloud-desktop-3.16.4/translations/client_fr.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_fr.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>Activer la sync. rapide</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>La synchronisation rapide va uniquement synchroniser les modifications des fichiers et des dossiers dans les dossiers qui ont ?t? explor?s. Ceci peut significativement augmenter la r?activit? sur la configuration initiale des fichiers virtuelles. Cependant, cela va causer des t?l?chargements redondants de fichiers d?plac?s dans un dossier non explor?.</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>Activer les fichiers virtuels</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation>Autoriser la suppression des ?l?ments dans la corbeille</translation>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -558,7 +550,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Importation de l'h?ritage</translation>
</message>
@@ -573,7 +565,7 @@
<translation>Ignorer</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>Impossible d'importer des comptes ? partir de l'ancienne configuration client.</translation>
</message>
@@ -581,33 +573,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Espace de stockage : ...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Les dossiers d?coch?s seront <b>supprim?s</b> de votre disque local et ne seront plus synchronis?s avec cet ordinateur.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Annuler</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Appliquer</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Connect? au serveur <server> avec le compte <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Tout synchroniser</translation>
@@ -638,6 +608,33 @@
<translation>Param?tres de connexion</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Appliquer</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Espace de stockage : ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Annuler</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Connect? au serveur <server> avec le compte <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Aucun compte configur?.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>Chiffrement de bout en bout avec fichiers virtuels</translation>
@@ -672,9 +669,9 @@
<b>Ce processus n'est pas r?versible. ?tes-vous s?r de vouloir le faire ?</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Aucun compte configur?.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation>Oublier la configuration du chiffrement</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -687,6 +684,11 @@
<translation>Afficher la phrase secr?te</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation>Le chiffrement est configur?. Souvenez-vous de <b>Chiffrer</b> un dossier pour chiffrer de bout en bout chaque nouveau fichier qui lui sera ajout?.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>Le chiffrement de bout en bout a ?t? activ? sur ce compte</translation>
@@ -712,6 +714,12 @@
<translation>Le dossier a une erreur de synchronisation. Le chiffrement de ce dossier sera possible quand la synchronisation aura r?ussi.</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation>Vous ne pouvez pas chiffrer ce dossier puisque le chiffrement n'est pas encore configur? sur cet appareil. Voulez-vous le faire maintenant ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -735,12 +743,6 @@
<translation>Impossible de chiffrer le dossier car il n'existe plus</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Ouvrir le dossier</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Chiffrer</translation>
@@ -779,16 +781,6 @@
<translation>Red?marrer la synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Reprendre la synchronisation</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Mettre en pause la synchronisation</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Retirer la connexion de synchronisation de dossier</translation>
@@ -814,21 +806,11 @@
<translation>?chec de la cr?ation du dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Impossible de cr?er le dossier local <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmer le retrait de la synchronisation de dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Voulez-vous vraiment arr?ter de synchroniser le dossier <i>%1</i> ?</p><p><b>Note :</b> Aucun fichier ne sera supprim?.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Retirer la synchronisation de ce dossier</translation>
@@ -860,24 +842,24 @@
<translation>Phrase secr?te du chiffrement de bout en bout</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>Pour prot?ger votre identit? cryptographique, nous la chiffrons avec une phrase secr?te de 12 mots du dictionnaire. Veuillez la noter et la garder en s?curit?. Elle sera n?cessaire pour ajouter d?autres appareils ? votre compte (comme votre smartphone ou votre ordinateur portable).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation>Pour prot?ger votre identit? cryptographique, nous la chiffrons avec une phrase secr?te de 12 mots du dictionnaire. Veuillez la noter et la garder en s?curit?. Elle sera n?cessaire pour configurer la synchronisation de dossiers chiffr?s sur vos autres appareils.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>D?sactiver le chiffrement de bout en bout</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation>Oublier le chiffrement de bout en bout sur cet appareil</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>D?sactiver le chiffrement de bout en bout pour %1 ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation>Voulez-vous oublier les param?tres de chiffrement de bout en bout pour %1 sur cet appareil ?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>Le retrait du chiffrage de bout en bout supprimera localement les fichiers chiffr?s synchronis?s.<br>Les fichiers chiffr?s demeureront sur le serveur.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation>Oublier le chiffrement de bout en bout supprimera les donn?es sensibles et tous les fichiers chiffr?s sur cet appareil. <br> Cependant, les fichiers chiffr?s resteront sur le serveur et sur vos autres appareils, si le chiffrement est configur?.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -890,35 +872,44 @@
<translation>La synchronisation est en cours.<br/>Voulez-vous l'arr?ter ?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) utilis?s sur %2. Certains dossiers, mont?s depuis le r?seau ou partag?s, peuvent avoir des limites diff?rentes.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 utilis?(s)</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 utilis?s sur %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>Migrer le certificat vers une nouvelle cl?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Actuellement aucune information d'utilisation de stockage n'est disponible.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>Il y a des dossiers qui ont augment? de taille au-del? de %1 Mo : %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 utilis?(s)</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation>Le chiffrement de bout en bout a ?t? activ? sur ce compte avec un autre appareil.<br>Entrez votre phrase secr?te pour synchroniser les dossiers chiffr?s sur cet appareil.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 avec le compte %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>Le chiffrement de bout en bout a ?t? activ? sur ce compte avec un autre appareil.<br>Il peut ?tre activ? sur cet appareil en entrant votre phrase secr?te.<br>Cela permettra la synchronisation des dossiers chiffr?s existants.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>La version %1 du serveur n'est pas maintenue !
-Vous prenez vos propres risques.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation>Ce compte supporte le chiffrement de bout en bout, mais il est d'abord n?cessaire de le configurer.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Configurer le chiffrement</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Ce compte prend en charge le chiffrement de bout en bout.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -936,79 +927,126 @@
<translation>Le serveur %1 est en cours de maintenance.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>Le serveur %1 est actuellement redirig? ou votre connexion est derri?re un portail captif.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Session sur %1 ferm?e.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Connexion ? %1 ...</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Certains dossiers n'ont pas ?t? synchronis?s parce qu'ils sont de taille trop importante :</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>Impossible de se connecter ? %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Certains dossiers n'ont pas ?t? synchronis?s parce qu'ils sont localis?s sur un stockage externe :</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Erreur de configuration serveur : %1 ? %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Certains dossiers n'ont pas ?t? synchronis?s parce qu'ils sont localis?s sur un stockage externe ou qu'ils sont de taille trop importante :</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>Vous devez accepter les conditions d'utilisation ici %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Ouvrir le dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Aucune connexion ? %1 configur?e</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Reprendre la synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>Migrer le certificat vers une nouvelle cl?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Mettre en pause la synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Certains dossiers n'ont pas ?t? synchronis?s parce qu'ils sont de taille trop importante :</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Impossible de cr?er le dossier local <i>%1</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Certains dossiers n'ont pas ?t? synchronis?s parce qu'ils sont localis?s sur un stockage externe :</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Voulez-vous vraiment arr?ter de synchroniser le dossier <i>%1</i> ?</p><p><b>Note :</b> Aucun fichier ne sera supprim?.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Certains dossiers n'ont pas ?t? synchronis?s parce qu'ils sont localis?s sur un stockage externe ou qu'ils sont de taille trop importante :</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>Pour prot?ger votre identit? cryptographique, nous la chiffrons avec une phrase secr?te de 12 mots du dictionnaire. Veuillez la noter et la garder en s?curit?. Elle sera n?cessaire pour ajouter d?autres appareils ? votre compte (comme votre smartphone ou votre ordinateur portable).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>Il y a des dossiers qui ont augment? de taille au-del? de %1 Mo : %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>D?sactiver le chiffrement de bout en bout</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>Le chiffrement de bout en bout a ?t? activ? sur ce compte avec un autre appareil.<br>Il peut ?tre activ? sur cet appareil en entrant votre phrase secr?te.<br>Cela permettra la synchronisation des dossiers chiffr?s existants.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>D?sactiver le chiffrement de bout en bout pour %1 ?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Ce compte prend en charge le chiffrement de bout en bout.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>Le retrait du chiffrage de bout en bout supprimera localement les fichiers chiffr?s synchronis?s.<br>Les fichiers chiffr?s demeureront sur le serveur.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Configurer le chiffrement</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) utilis?s sur %2. Certains dossiers, mont?s depuis le r?seau ou partag?s, peuvent avoir des limites diff?rentes.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 utilis?s sur %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Actuellement aucune information d'utilisation de stockage n'est disponible.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 avec le compte %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>La version %1 du serveur n'est pas maintenue !
+Vous prenez vos propres risques.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>Le serveur %1 est actuellement redirig? ou votre connexion est derri?re un portail captif.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Connexion ? %1 ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>Impossible de se connecter ? %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Erreur de configuration serveur : %1 ? %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>Vous devez accepter les conditions d'utilisation ici %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Aucune connexion ? %1 configur?e</translation>
</message>
</context>
<context>
@@ -1123,11 +1161,6 @@
<translation>Certificat & cl? (pkcs12) :</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Parcourir ?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Mot de passe du certificat :</translation>
@@ -1138,6 +1171,11 @@
<translation>Un paquet pkcs12 chiffr? est vivement recommand? vu qu'une copie sera stock?e dans le fichier de configuration.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Parcourir ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>S?lectionner un certificat</translation>
@@ -1188,34 +1226,34 @@
<translation>Continuer</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 comptes</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 compte</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 dossiers</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 dossier</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Importation h?rit?e</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1223,12 +1261,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Erreur lors de l'acc?s au fichier de configuration</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>Une erreur est survenue lors de l'acc?s au fichier de configuration ? %1. Merci de v?rifier que le fichier est accessible du compte syst?me.</translation>
</message>
@@ -1270,6 +1308,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation>Le fichier %1 est en cours d'utilisation</translation>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1277,6 +1354,11 @@
<translation>Le fichier %1 ne peut ?tre t?l?vers? parce qu'un autre fichier avec le m?me nom hormis la casse existe</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation>Le fichier contient des espaces en d?but ou en fin de fichier et n'a pas pu ?tre renomm?</translation>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Le fichier %1 pr?sente une heure de modification invalide. T?l?versement vers le serveur impossible.</translation>
@@ -1481,7 +1563,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Erreur ? l'?criture des m?tadonn?es dans la base de donn?es</translation>
</message>
@@ -1611,21 +1693,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Voulez-vous supprimer le dossier <i>%1</i> et tout son contenu d?finitivement ?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Voulez-vous supprimer le fichier <i>%1</i> d?finitivement ?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Confirmer la suppression</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1641,30 +1708,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Aucun compte Nextcloud n'est param?tr?</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Voulez-vous supprimer le dossier <i>%1</i> et tout son contenu d?finitivement ?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Erreur d'authentification?: nom d?utilisateur et/ou mot de passe incorrect(s).</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Voulez-vous supprimer le fichier <i>%1</i> d?finitivement ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Confirmer la suppression</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>D?lai d'attente</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Les informations d'identification fournies ne sont pas correctes</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>Le serveur configur? pour ce client est trop vieux</translation>
@@ -1674,16 +1741,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Veuillez mettre ? jour le serveur vers la derni?re version et red?marrer le client.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Erreur d'authentification?: nom d?utilisateur et/ou mot de passe incorrect(s).</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Aucun compte Nextcloud n'est param?tr?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Les informations d'identification fournies ne sont pas correctes</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Erreur lors de l'annulation de la suppression d'un fichier</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>Erreur lors de l'annulation de la suppression de %1</translation>
</message>
@@ -1691,19 +1773,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Erreur du serveur : La r?ponse PROPFIND n'est pas au format XML !</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>Erreur lors de la configuration des m?tadonn?es chiffr?es !</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>Erreur de configuration des m?tadonn?es chiffr?es: la signature initiale du serveur est vide.</translation>
</message>
@@ -1711,27 +1793,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Erreur ? l?ouverture du dossier %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Dossier non accessible au client, permission refus?e</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Dossier non trouv? : %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>L?encodage du nom de fichier n?est pas valide</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Erreur de lecture du dossier %1</translation>
</message>
@@ -1971,11 +2053,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>L'URL du sondage ne commence pas par HTTPS alors que l'URL de connexion commence par HTTPS. La connexion ne sera pas possible car cela pourrait ?tre un probl?me de s?curit?. Veuillez contacter votre administrateur.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>L'URL renvoy?e par le serveur ne commence pas par HTTPS alors que l'URL de connexion commence par HTTPS. La connexion ne sera pas possible car cela pourrait ?tre un probl?me de s?curit?. Veuillez contacter votre administrateur.</translation>
@@ -1987,28 +2064,33 @@
<translation>Erreur renvoy?e par le serveur : <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>L'URL du sondage ne commence pas par HTTPS alors que l'URL de connexion commence par HTTPS. La connexion ne sera pas possible car cela pourrait ?tre un probl?me de s?curit?. Veuillez contacter votre administrateur.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Une erreur est survenue en acc?dant au "jeton" : <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Impossible d'analyser le JSON renvoy? par le serveur : <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>La r?ponse du serveur ne contient pas tous les champs attendus</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation>La r?ponse du serveur ne contenait pas tous les champs attendus?: <br><em>%1</em></translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Impossible d'analyser le JSON renvoy? par le serveur : <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2051,6 +2133,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 a ?t? supprim?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 a ?t? mis ? jour.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 a ?t? renomm? en %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 a ?t? d?plac? vers %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation><numerusform>%1 a ?t? supprim?.</numerusform><numerusform>%1 et %n autres fichiers ont ?t? supprim?s.</numerusform><numerusform>%1 et %n autre(s) fichier(s) ont ?t? supprim?s.</numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>Veuillez choisir un emplacement diff?rent. Le dossier %1 n'existe pas.</translation>
@@ -2066,17 +2176,6 @@
<translation>Veuillez choisir un emplacement diff?rent. %1 n'est pas un dossier lisible.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 a ?t? supprim?.</numerusform><numerusform>%1 et %n autres fichiers ont ?t? supprim?s.</numerusform><numerusform>%1 et %n autres fichiers ont ?t? supprim?s.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 a ?t? supprim?.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 et %n autre fichier ont ?t? ajout?s.</numerusform><numerusform>%1 et %n autres fichiers ont ?t? ajout?s.</numerusform><numerusform>%1 et %n autres fichiers ont ?t? ajout?s.</numerusform></translation>
@@ -2092,33 +2191,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 a ?t? mis ? jour.</numerusform><numerusform>%1 et %n autres fichiers ont ?t? mis ? jour.</numerusform><numerusform>%1 et %n autres fichiers ont ?t? mis ? jour.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 a ?t? mis ? jour.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 a ?t? renomm? en %2.</numerusform><numerusform>%1 a ?t? renomm? en %2 et %n autres fichiers ont ?t? renomm?s.</numerusform><numerusform>%1 a ?t? renomm? en %2 et %n autres fichiers ont ?t? renomm?s.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 a ?t? renomm? en %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 a ?t? d?plac? vers %2.</numerusform><numerusform>%1 a ?t? d?plac? vers %2 et %n autres fichiers ont ?t? d?plac?s.</numerusform><numerusform>%1 a ?t? d?plac? vers %2 et %n autres fichiers ont ?t? d?plac?s.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 a ?t? d?plac? vers %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2155,19 +2237,19 @@
<translation>Activit? de synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Impossible de lire le fichier d'exclusion du syst?me</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Un nouveau dossier de taille sup?rieure ? %1 Mo a ?t? ajout? : %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Un nouveau dossier localis? sur un stockage externe a ?t? ajout?.
@@ -2175,49 +2257,49 @@
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Merci d'aller dans les Param?tres pour indiquer si vous souhaitez le t?l?charger.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>Un dossier a d?pass? la taille limite fix?e de %1 Mo : %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>Continuer la synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>Arr?ter la synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>Le dossier %1 a d?pass? la taille limite fix?e de %2 Mo.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>Voulez vous arr?ter la synchronisation de ce dossier ?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Le dossier %1 a ?t? cr?? mais il ?tait exclu de la synchronisation auparavant. Les donn?es qu'il contient ne seront pas synchronis?es.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Le fichier %1 a ?t? cr?? mais il ?tait exclu de la synchronisation auparavant. Il ne sera pas synchronis?.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2230,12 +2312,12 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>Le t?l?chargement du fichier virtuel a ?chou? avec le code ? %1 ?, ?tat ? %2 ? et le message d'erreur ? %3 ?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2244,7 +2326,7 @@
Vous pouvez ?galement restaurer tous les fichiers supprim?s en les t?l?versant depuis le dossier '%1' vers le serveur.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2253,22 +2335,22 @@
Vous pouvez ?galement restaurer tous les fichiers supprim?s en les t?l?chargeant depuis le serveur.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>Proc?der ? la suppression</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>Restaurer les fichiers sur le serveur</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>Restaurer des fichiers ? partir du serveur</translation>
</message>
@@ -2309,11 +2391,6 @@
<translation>Impossible de r?initialiser l'?tat du dossier</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>Un ancien fichier journal "%1" a ?t? trouv?, mais ne peut ?tre supprim?. Veuillez vous assurer qu?aucune application ne l'utilise en ce moment.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(sauvegarde)</translation>
@@ -2324,6 +2401,11 @@
<translation>(sauvegarde %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>Un ancien fichier journal "%1" a ?t? trouv?, mais ne peut ?tre supprim?. Veuillez vous assurer qu?aucune application ne l'utilise en ce moment.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Statut ind?fini.</translation>
@@ -2394,16 +2476,6 @@
<translation>La requ?te de synchronisation a ?t? annul?e.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>La synchronisation est en pause.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (Synchronisation en pause)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>Veuillez choisir un emplacement diff?rent. Le dossier s?lectionn? n'est pas valide.</translation>
@@ -2453,6 +2525,16 @@
Pour r?soudre ce probl?me: veuillez enlever %1 d'un des comptes et cr?er un nouveau dossier de synchronisation.
Pour les utilisateurs avanc?s: ce probl?me peut aussi venir de plusieurs fichiers de bases de donn?es de synchronisation dans un seul dossier. Veuillez v?rifier si %1 contient des fichiers .sync_*.db p?rim?s ou inutilis?s et supprimez-les.</translation>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>La synchronisation est en pause.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (Synchronisation en pause)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2496,16 +2578,6 @@
<translation>Une erreur est survenue lors du chargement de la liste des dossiers depuis le serveur.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>R?cup?ration de la liste des dossiers depuis le serveur...</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Il y a des conflits non r?solus. Cliquez pour plus de d?tails.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>Support des fichiers virtuels activ?.</translation>
@@ -2547,16 +2619,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>T?l?charger %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>Fichier %1 sur %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Il y a des conflits non r?solus. Cliquez pour plus de d?tails.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>T?l?charger %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>R?cup?ration de la liste des dossiers depuis le serveur...</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2603,21 +2690,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 sur %2, fichier %3 sur %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>Fichier %1 sur %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>En attente de %n autre dossier ...</numerusform><numerusform>En attente de %n autres dossiers ...</numerusform><numerusform>En attente de %n autres dossiers ...</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>Sur le point de d?marrer la synchronisation</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>En attente de %n autre dossier ...</numerusform><numerusform>En attente de %n autres dossiers ...</numerusform><numerusform>En attente de %n autres dossiers ...</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2777,11 +2859,6 @@
<translation>Param?tres g?n?raux</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Lancer au d?marrage du syst?me</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>Afficher les notifications d'appel</translation>
@@ -2792,11 +2869,6 @@
<translation>Pour la zone de notification syst?me</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Utiliser les ic?nes &monochromes</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>Afficher les notifications de discussion</translation>
@@ -2812,17 +2884,32 @@
<translation>Avanc?s</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Demander confirmation avant de synchroniser les dossiers plus grands que</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>Mo</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Demander confirmation avant de synchroniser des stockages externes </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Lancer au d?marrage du syst?me</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Utiliser les ic?nes &monochromes</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Demander confirmation avant de synchroniser les dossiers plus grands que</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>Notifier lorsque les dossiers synchronis?s d?passent la limite sp?cifi?e</translation>
@@ -2833,11 +2920,6 @@
<translation>D?sactiver automatiquement la synchronisation des dossiers qui d?passent la limite fix?e</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Demander confirmation avant de synchroniser des stockages externes </translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>D?placer les fichiers supprim?s vers la corbeille</translation>
@@ -2889,11 +2971,6 @@
<translation>Canal de mise ? jour</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>Red?marrer et Mettre ? jour</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>&V?rifier automatiquement les mises ? jour</translation>
@@ -2914,6 +2991,16 @@
<translation>Mentions l?gales</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>Red?marrer et Mettre ? jour</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Notifications du serveur requ?rant votre attention.</translation>
@@ -2934,6 +3021,11 @@
<translation>Vous ne pouvez pas d?sactiver le d?marrage automatique parce que le d?marrage automatique ? l'?chelle du syst?me est activ?.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>stable</translation>
@@ -3015,6 +3107,11 @@
<source>Debug archive is created at %1</source>
<translation>Archive de d?bogage cr??e ? %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3178,102 +3275,97 @@
<translation>Nouveau nom de fichier</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Renommer le fichier</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>Le fichier "%1" n'a pas pu ?tre synchronis? car son nom contient des caract?res qui ne sont pas autoris?s sur ce syst?me.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>Les caract?res suivants ne sont pas autoris?s dans les noms de fichier sur ce syst?me : * " | & ? , ; : \ / ~ < > espaces en d?but et fin de cha?ne</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
- <translation type="unfinished"/>
+ <translation>Les caract?res suivants ne sont pas autoris?s sur ce syst?me : \ / : ? * " < > | espaces en d?but et fin de cha?ne</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>Le fichier "%1" n'a pas pu ?tre synchronis?, car le nom contient des caract?res qui ne sont pas autoris?s sur le serveur.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>Les caract?res suivants ne sont pas autoris?s : %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>Les noms de base suivants de fichiers ne sont pas autoris?s : %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>Les noms de fichiers suivants ne sont pas autoris?s : %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>Les extensions de fichiers suivantes ne sont pas autoris?es : %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>V?rification des permissions de renommage...</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>Vous n'avez pas la permission de renommer ce fichier. Veuillez demander ? son auteur de le renommer.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>Erreur ? la r?cup?ration des permissions : %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>Le nom de fichier contient des espaces en d?but ou en fin de cha?ne.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>Le nom du fichier contient des espaces au d?but.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>Le nom de fichier contient des espaces ? la fin.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>Nom invalide</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>Le nom du fichier contiens des caract?res ill?gaux: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>Impossible de renommer le fichier. Veuillez vous certifier que vous ?tes bien connect? au serveur.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>Impossible de renommer le fichier parce qu'un fichier avec le m?me nom existe d?j? sur le serveur. Merci de choisir un autre nom.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>Impossible de renommer le dossier local %1</translation>
</message>
@@ -3397,16 +3489,6 @@
<translation><p>Une nouvelle version du client %1 est disponible.</p><p><b>%2</b> est disponible en t?l?chargement. La version actuellement install?e est %3.<p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Ignorer pour cette fois</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>T?l?charger la version</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>?chec de mise ? jour</translation>
@@ -3431,6 +3513,16 @@
<source>Update manually</source>
<translation>Mettre ? jour manuellement</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Ignorer pour cette fois</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>T?l?charger la version</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3455,6 +3547,23 @@
<translation>Le serveur proxy requiert une authentification</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Bande passante de r?ception</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Limiter ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>Ko/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>Remarque: les param?tres de proxy n'ont aucun effet sur les comptes sur localhost</translation>
@@ -3477,46 +3586,29 @@
<translation>Utiliser les param?tres globaux</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Bande passante de r?ception</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Aucune limite</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>Ko/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Limiter ?</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Limiter aux 3/4 de la bande passante estim?e</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Bande passante d'?mission</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Limiter automatiquement</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Bande passante d'?mission</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Nom d'h?te du serveur proxy</translation>
@@ -3545,6 +3637,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>Impossible de v?rifier la pr?sence de nouvelles mises ? jour.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>V?rification du serveur de mises ? jour ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>Une nouvelle mise ? jour de %1 est disponible</translation>
@@ -3575,11 +3677,6 @@
<translation>Impossible de t?l?charger la mise ? jour. Ouvrez %1 pour t?l?charger manuellement la mise ? jour.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>Impossible de v?rifier la pr?sence de nouvelles mises ? jour.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>Un nouveau %1 est disponible. Merci d'ouvrir <a href='%2'>%2</a> pour t?l?charger la mise ? jour.</translation>
@@ -3590,16 +3687,21 @@
<translation>Un nouveau %1 est disponible. Merci d'ouvrir %2 pour t?l?charger la mise ? jour.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>V?rification du serveur de mises ? jour ...</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>L'?tat du processus de mise ? jour est inconnu. Impossible de v?rifier la pr?sence de mises ? jour.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation>Vous utilisez le canal de mise ? jour %1. Votre installation est la derni?re version.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation>Aucune mise ? jour n'est disponible. Votre installation est la derni?re version.</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Aucune mise ? jour disponible. Votre installation est ? jour.</translation>
@@ -3775,11 +3877,6 @@
<translation><font color="green">Connect? avec succ?s ? %1 : %2 version %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>URL invalide</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>?chec de la connexion ? %1 sur %2 :<br/>%3</translation>
@@ -3790,6 +3887,16 @@
<translation>D?lai d'attente d?pass? lors de la connexion ? %1 sur %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Acc?s impossible. Afin de v?rifier l'acc?s au serveur, <a href="%1">cliquez ici</a> et connectez-vous au service avec votre navigateur web.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>URL invalide</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Tentative de connexion ? %1 sur %2 ...</translation>
@@ -3800,11 +3907,6 @@
<translation>La demande authentifi?e au serveur a ?t? redirig?e vers "%1". L'URL est mauvaise, le serveur est mal configur?. </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Acc?s impossible. Afin de v?rifier l'acc?s au serveur, <a href="%1">cliquez ici</a> et connectez-vous au service avec votre navigateur web.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>Il y a eu une r?ponse invalide ? une demande WebDAV authentifi?e</translation>
@@ -4016,64 +4118,36 @@
<translation>Les noms de fichier se terminant par un point ne sont pas pris en charge sur votre syst?me.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Dossier</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Fichier</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
- <translation type="unfinished"/>
+ <translation>Les noms de dossiers contenant le caract?re "%1" ne sont pas pris en charge par ce syst?me de fichiers.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>Le nom %1 contenant le caract?re ??%2?? n?est pas support? sur ce syst?me de fichiers.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
- <translation type="unfinished"/>
+ <translation>Les noms de fichiers contenant le caract?re "%1" ne sont pas pris en charge par ce syst?me de fichiers.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>Le nom %1 contient au moins un caract?re invalide</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>Le nom %1 est un nom r?serv? sur ce syst?me de fichiers.</translation>
+ <translation>Le nom du dossier contient au moins un caract?re interdit</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>Le nom du fichier contient au moins un caract?re interdit</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
+ <translation>Le nom du dossier est un nom r?serv? sur ce syst?me de fichiers.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
+ <translation>Le nom du fichier est un nom r?serv? sur ce syst?me de fichiers.</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="433"/>
@@ -4081,6 +4155,24 @@
<translation>Le nom du fichier finit par des espaces.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Dossier</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Fichier</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>Le nom %1 contenant le caract?re ??%2?? n?est pas support? sur ce syst?me de fichiers.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4089,6 +4181,16 @@
<translation>Ne peut ?tre renomm? ou t?l?vers?.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>Le nom %1 contient au moins un caract?re invalide</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>Le nom %1 est un nom r?serv? sur ce syst?me de fichiers.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>Nom de fichier contenant des espaces au d?but.</translation>
@@ -4179,64 +4281,74 @@
<translation>Le serveur n'a signal? aucun %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Impossible de synchroniser ? cause d'une date de modification invalide</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation>Le t?l?versement de %1 d?passe les %2 d'espace restant de l'espace personnel.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation>Le t?l?versement de %1 d?passe les %2 d'espace restant du dossier %3.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>Impossible de t?l?verser le fichier, car il est ouvert dans ? %1 ?.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>Erreur ? la suppression de l'enregistrement du fichier %1 de la base de donn?es</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>D?plac? vers une cible invalide, restauration</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>Impossible de modifier l'?l?ment chiffr? car le certificat s?lectionn? n'est pas valide.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Exclus en raison de la liste noire "S?lectionner le contenu ? synchroniser".</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Non autoris? car vous n'avez pas la permission d'ajouter des sous-dossiers dans ce dossier</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Non autoris? car vous n'avez pas la permission d'ajouter des fichiers dans ce dossier</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Non autoris? ? t?l?verser ce fichier, car il est en lecture seule sur le serveur, restauration en cours</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>Suppression non autoris?e, restauration en cours</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Erreur de lecture de la base de donn?es</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>Le serveur a r?pondu avec une erreur lors de la lecture du dossier "%1" : %2</translation>
</message>
@@ -4244,38 +4356,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>Impossible de supprimer le fichier %1 de la base de donn?es locale</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>Erreur de mise ? jour des m?tadonn?es ? cause d'une date de modification invalide</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>Le dossier %1 ne peut pas ?tre mis en lecture seule : %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>Exception inconnue</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Erreur lors de la mise ? jour des m?tadonn?es : %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>Le fichier est actuellement en cours d'utilisation</translation>
</message>
@@ -4293,12 +4405,6 @@
<translation>Le fichier %1 ne peut pas ?tre t?l?charg? car les informations de chiffrement sont manquantes.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>Le fichier a chang? depuis sa d?couverte</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4355,6 +4461,12 @@
<source>The file %1 is currently in use</source>
<translation>Le fichier %1 est en cours d'utilisation</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>Le fichier a chang? depuis sa d?couverte</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4372,39 +4484,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>impossible de supprimer le fichier %1. Erreur : %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>Le dossier %1 n'a pu ?tre cr?? ? cause d'un conflit local de nom de fichier ou de dossier !</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>Impossible de cr?er le dossier %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>Le dossier %1 ne peut ?tre rendu en lecture seule : %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>Exception inconnue</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Erreur lors de la mise ? jour des m?tadonn?es : %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>Le fichier %1 est en cours d'utilisation</translation>
</message>
@@ -4417,14 +4529,14 @@
<translation>Impossible de retirer %1 en raison d'un conflit de nom de fichier local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation>Erreur temporaire lors de la suppression d'un ?l?ment local supprim? du serveur.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Impossible de supprimer l'enregistrement du fichier %1 depuis la base de donn?es locale</translation>
</message>
@@ -4432,49 +4544,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>Le dossier %1 n?a pu ?tre renomm? ? cause d?un conflit local de nom de fichier ou de dossier !</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>Fichier %1 t?l?charg?, mais a abouti ? un conflit de casse du nom de fichier local !</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>Impossible de r?cup?rer le fichier %1 depuis la base de donn?es locale</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Erreur lors de la modification de l'?tat du fichier</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Erreur lors de la mise ? jour des m?tadonn?es : %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>Le fichier %1 est en cours d'utilisation</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>Impossible de propager le renommage du dossier dans la hi?rarchie</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>?chec lors du changement de nom du fichier</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Impossible de r?cup?rer le fichier %1 depuis la base de donn?es locale</translation>
</message>
@@ -4531,39 +4643,39 @@
<translation>Impossible de renommer %1 en %2, erreur: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Erreur lors de la mise ? jour des m?tadonn?es : %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>Le fichier %1 est en cours d'utilisation</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Le code HTTP retourn? par le serveur n'est pas valide. La valeur attendue est 201 mais la valeur re?ue est "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>Impossible de r?cup?rer le fichier %1 depuis la base de donn?es locale</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Impossible de r?cup?rer le fichier %1 depuis la base de donn?es locale</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Erreur lors de la modification de l'?tat du fichier</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Erreur ? l'?criture des m?tadonn?es dans la base de donn?es</translation>
</message>
@@ -4571,22 +4683,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>?chec de t?l?versement du fichier chiffr?.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>Impossible de t?l?verser le fichier %1 car un autre fichier de m?me nom existe, diff?rent seulement par la casse.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>Le t?l?versement de %1 provoque un d?passement du quota du dossier</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4594,11 +4695,6 @@
<translation>Le fichier %1 pr?sente une heure de modification invalide. Ne t?l?versez pas sur le serveur.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Fichier supprim? (d?but du t?l?versement) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Fichier local modifi? pendant la synchronisation. Elle va reprendre. </translation>
@@ -4628,6 +4724,22 @@
<source>The file %1 is currently in use</source>
<translation>Le fichier %1 est en cours d'utilisation</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>Le t?l?versement de %1 provoque un d?passement du quota du dossier</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>?chec de t?l?versement du fichier chiffr?.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Fichier supprim? (d?but du t?l?versement) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4876,6 +4988,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Partage du menu contextuel</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>J'ai partag? quelque chose avec vous</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Options de partage</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Envoyer le lien priv? par e-mail ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Copier le lien priv? dans le presse-papier</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>?chec du chiffrement du dossier ? "%1"</translation>
@@ -4910,43 +5048,17 @@
<translation>Le dossier suivant a ?t? chiffr? avec succ?s : "%1"</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Partage du menu contextuel</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>S?lectionnez le nouvel emplacement ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>J'ai partag? quelque chose avec vous</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Options de partage</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Activit?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Copier le lien priv? dans le presse-papier</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Envoyer le lien priv? par e-mail ...</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>Quitter ce partage</translation>
@@ -4962,11 +5074,6 @@
<translation>Repartager ce dossier est interdit</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Copier le lien interne</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>Chiffrer</translation>
@@ -4993,12 +5100,6 @@
<translation><numerusform>Expire dans %1 minute</numerusform><numerusform>Expire dans %1 minutes</numerusform><numerusform>Expire dans %1 minutes</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Ouvrir dans le navigateur</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>R?soudre le conflit?</translation>
@@ -5028,6 +5129,17 @@
<source>Delete</source>
<translation>Supprimer</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Copier le lien interne</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Ouvrir dans le navigateur</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5129,13 +5241,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Cette connexion n'est PAS s?curis?e car elle n'est pas chiffr?e.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Version du serveur : %1</translation>
@@ -5155,6 +5260,13 @@
<source>The connection is not secure</source>
<translation>La connexion n'est pas s?curis?e</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Cette connexion n'est PAS s?curis?e car elle n'est pas chiffr?e.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5247,6 +5359,32 @@
<translation>%1 (ignor? ? cause d'une pr?c?dente erreur, nouvel essai dans %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Seulement %1 disponibles, il faut au moins %2 pour d?marrer</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>Impossible d'acc?der ou de cr?er une base de donn?es locale de synchronisation. Assurez vous de disposer des droits d'?criture dans le dossier de synchronisation.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>L'espace disque est faible : les t?l?chargements qui am?neraient ? r?duire l'espace libre en dessous de %1 ont ?t? ignor?s.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>Il n'y a pas suffisamment d?espace disponible sur le serveur pour certains t?l?versements.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>conflit non r?solu.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>Impossible de mettre ? jour le fichier : %1</translation>
@@ -5267,22 +5405,6 @@
<translation>Impossible de d?finir l'enregistrement du fichier dans la base de donn?es locale : %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>conflit non r?solu.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Seulement %1 disponibles, il faut au moins %2 pour d?marrer</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>Impossible d'acc?der ou de cr?er une base de donn?es locale de synchronisation. Assurez vous de disposer des droits d'?criture dans le dossier de synchronisation.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Utilisation de fichiers virtuels avec suffixe, mais le suffixe n'est pas d?fini</translation>
@@ -5302,16 +5424,6 @@
<source>Cannot open the sync journal</source>
<translation>Impossible d'ouvrir le journal de synchronisation</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>L'espace disque est faible : les t?l?chargements qui am?neraient ? r?duire l'espace libre en dessous de %1 ont ?t? ignor?s.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>Il n'y a pas suffisamment d?espace disponible sur le serveur pour certains t?l?versements.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5322,7 +5434,7 @@
<translation>Hors ligne</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>Vous devez accepter les conditions d'utilisation</translation>
</message>
@@ -5583,7 +5695,7 @@
<message numerus="yes">
<location filename="../src/gui/tray/usermodel.cpp" line="176"/>
<source>%n notification(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>%n notification</numerusform><numerusform>%n notifications</numerusform><numerusform>%n notification(s)</numerusform></translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="673"/>
@@ -5706,11 +5818,6 @@
<source>Less than a minute</source>
<translation>Il y a moins d'une minute</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5718,20 +5825,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1 minutes</numerusform><numerusform>%1 minutes</numerusform><numerusform>%1 minutes</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1 heures</numerusform><numerusform>%1 heures</numerusform><numerusform>%1 heures</numerusform></translation>
@@ -5746,6 +5843,21 @@
<source>%1 days</source>
<translation><numerusform>%1 jours</numerusform><numerusform>%1 jours</numerusform><numerusform>%1 jours</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation><numerusform>%n minute</numerusform><numerusform>%n minutes</numerusform><numerusform>%n minute(s)</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n heure</numerusform><numerusform>%n heures</numerusform><numerusform>%n heure(s)</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n jour</numerusform><numerusform>%n jours</numerusform><numerusform>%n jour(s)</numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5888,6 +6000,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Veuillez vous connecter</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>Aucun dossier ? synchroniser n'est configur?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>D?connect? de %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Version du Serveur non prise en charge</translation>
@@ -5908,31 +6035,6 @@
<translation>Votre compte %1 vous demande d'accepter les conditions g?n?rales d'utilisation de votre serveur. Vous serez redirig? vers %2 pour confirmer que vous l'avez lu et que vous l'acceptez.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>D?connect? de %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>D?connect? des comptes :</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Compte %1 : %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Veuillez vous connecter</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>La synchronisation est en pause</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5954,11 +6056,6 @@
<translation>macOS VFS pour %1: Une erreur est survenue.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>Aucun dossier ? synchroniser n'est configur?</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>V?rification des modifications dans "%1" distant</translation>
@@ -5969,6 +6066,21 @@
<translation>V?rification des modifications dans "%1" local</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>D?connect? des comptes :</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Compte %1 : %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>La synchronisation est en pause</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5977,11 +6089,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Dossier local</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Nom d?utilisateur</translation>
@@ -6017,22 +6124,11 @@
<translation>Demander confirmation avant de synchroniser les dossiers de taille sup?rieure ? </translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>Mo</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Demander confirmation avant de synchroniser des stockages externes </translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>S?lectionner le contenu ? synchroniser</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Conserver les donn?es locales</translation>
@@ -6047,6 +6143,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Effacer le dossier local et d?marrer une synchronisation compl?te</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>Mo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>S?lectionner le contenu ? synchroniser</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Dossier local</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6087,6 +6199,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%nj.</numerusform><numerusform>%njrs</numerusform><numerusform>%njrs</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>Dans le futur</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1m</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%nmin</numerusform><numerusform>%nmin</numerusform><numerusform>%nmin</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>A l'instant</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Il y a quelque temps</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1 : %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6127,57 +6284,12 @@
<source>Synced %1</source>
<translation>%1 a ?t? synchronis?</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%nj.</numerusform><numerusform>%njrs</numerusform><numerusform>%njrs</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>Dans le futur</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>A l'instant</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1m</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%nmin</numerusform><numerusform>%nmin</numerusform><numerusform>%nmin</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Il y a quelque temps</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation>Le fichier est d?j? supprim?</translation>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1 : %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>Les chemins commen?ant par le caract?re ? # ? ne sont pas pris en charge dans le mode VFS.</translation>
@@ -6423,6 +6535,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>Ouvrir des dossiers locaux ou de groupe</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Ouvrir le dossier local</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Connect?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>D?connect?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>Ouvrir le dossier local ? %1 ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>Ouvrir le dossier de groupes "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>Ouvrir %1 dans l'explorateur de fichiers</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>Menu de groupe d'utilisateurs et dossiers locaux</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6612,16 +6767,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 octets</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 To</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 Go</translation>
@@ -6636,6 +6781,16 @@
<source>%L1 KB</source>
<translation>%L1 Ko</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 octets</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 To</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6869,16 +7024,16 @@
<translation>Une erreur est survenue pendant l'installation</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Pr?paration ? la synchronisation</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>Arr?t de la synchronisation</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Pr?paration ? la synchronisation</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>La synchronisation est en pause</translation>
@@ -6937,4 +7092,17 @@
<translation>Lib?rer de l'espace local</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>Activer la sync. rapide</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>La synchronisation rapide va uniquement synchroniser les modifications des fichiers et des dossiers dans les dossiers qui ont ?t? explor?s. Ceci peut significativement augmenter la r?activit? sur la configuration initiale des fichiers virtuelles. Cependant, cela va causer des t?l?chargements redondants de fichiers d?plac?s dans un dossier non explor?.</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_ga.ts nextcloud-desktop-3.16.6/translations/client_ga.ts
--- nextcloud-desktop-3.16.4/translations/client_ga.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_ga.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>Cumasaigh sioncron? tapa</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>N? dh?anfaidh sioncron? tapa ach athruithe ar chomhaid agus ar fhillte?in a shioncron? laistigh d'fhillte?in a ndearnadh ini?chadh orthu. Is f?idir leis seo freagr?lacht a mh?ad? go suntasach ar chumra?ocht tosaigh comhaid fh?or?la. Mar sin f?in, beidh s? ina ch?is le h?osl?d?lacha iomarcacha de chomhaid a aistr?odh chuig fillte?n neamhscr?daithe.</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>Cumasaigh comhaid fh?or?la</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation>Ceadaigh scriosadh m?reanna sa Bhruscar</translation>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -558,7 +550,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Iomp?rt?il oidhreachta</translation>
</message>
@@ -573,7 +565,7 @@
<translation>Scipe?il</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>N?orbh fh?idir cuntais a iomp?rt?il ? chumra?ocht an chliaint oidhreachta.</translation>
</message>
@@ -581,33 +573,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Sp?s st?r?la: ?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Bainfear fillte?in <b>neamhthice?ilte</b> do ch?ras comhad ?iti?il agus n? sioncr?naithe?far iad leis an r?omhaire seo a thuilleadh</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Cealaigh</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Cuir iarratas isteach</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Ceangailte le <server> mar <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Sioncr?naigh go l?ir</translation>
@@ -638,6 +608,33 @@
<translation>Socruithe ceangail</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Cuir iarratas isteach</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Sp?s st?r?la: ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Cealaigh</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Ceangailte le <server> mar <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>N?l aon chuntas cumraithe.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>Cripti? ceann go ceann le Comhaid F?or?la</translation>
@@ -672,9 +669,9 @@
1 N?l an pr?iseas seo inch?laithe. An bhfuil t? cinnte gur mhaith leat lean?int ar aghaidh?1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>N?l aon chuntas cumraithe.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation>D?an dearmad ar shocr? criptithe</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -687,6 +684,11 @@
<translation>Cuimhneach?n a thaispe?int</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation>T? an cripti? socraithe. Cuimhnigh fillte?n a <b>Chripti?</b> chun aon chomhaid nua a chuirtear leis a chripti? ? cheann ceann.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>Cumasa?odh cripti? ceann go ceann don chuntas seo</translation>
@@ -712,6 +714,13 @@
<translation>T? earr?id shioncronaithe san fhillte?n. Beifear in ann an fillte?n seo a chripti? nuair a bheidh s? sioncronaithe go rath?il</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation>N? f?idir leat an fillte?n seo a chripti? mar n?l an cripti? ? cheann ceann socraithe ar an ngl?as seo go f?ill.
+Ar mhaith leat ? seo a dh?anamh anois?</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -736,12 +745,6 @@
<translation>N?orbh fh?idir fillte?n a chripti? toisc nach bhfuil an fillte?n ann a thuilleadh</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Oscail fillte?n</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Criptigh</translation>
@@ -780,16 +783,6 @@
<translation>Atosaigh an sioncron?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Lean an sioncron?</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Cuir an sioncron? ar sos</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Remove folder sync connection</translation>
@@ -815,21 +808,11 @@
<translation>Theip ar chruth? fillte?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>N?orbh fh?idir fillte?n log?nta <i>%1</i>.</p>a chruth?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Deimhnigh Baint Ceangal Sioncronaithe Fillte?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Ar mhaith leat i nd?ir?re chun stop a syncing an fillte?n<i>%1</i>?</p><p><b>N?ta:</b> N? scriosfaidh s?<b>seo</b> aon chomhad.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Bain Ceangal Sioncronaithe Fillte?n</translation>
@@ -863,24 +846,24 @@
<translation>Cuimhneach?n criptithe ceann go deireadh</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>Chun d'Aitheantas Cripteagrafach a chosaint, d?anaimid ? a chripti? le cuimhneach?n de 12 fhocal focl?ra. Tabhair faoi deara iad seo agus coinnigh s?bh?ilte iad. Beidh siad ag teast?il chun gl?asanna eile a chur le do chuntas (cos?il le d?fh?n p?ca n? do r?omhaire gl?ine).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation>Chun d?Aitheantas Cripteagrafach a chosaint, cript?mid ? le mnemonic de 12 fhocal focl?ra. Scr?obh s?os ? agus coinnigh sl?n ?. Beidh s? de dh?th ort chun sioncr?n? fillte?n criptithe a shocr? ar do ghl?asanna eile.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>D?chumasaigh cripti? ceann go ceann</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation>D?an dearmad ar an gcripti? ? cheann ceann ar an ngl?as seo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>An bhfuil fonn ort an cripti? ceann go ceann do % 1 a dh?chumas??</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation>Ar mhaith leat dearmad a dh?anamh ar shocruithe criptithe foirceann go foirceann do %1 ar an ngl?as seo?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>M? bhaintear cripti? ceann go ceann, bainfear comhaid at? sioncronaithe go h?iti?il agus at? criptithe.1 Fanfaidh comhaid criptithe ar an bhfreastala?.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation>M? dh?anann t? dearmad ar chripti? ? cheann ceann go ceann, bainfear na sonra? ?ogaire agus na comhaid chriptithe go l?ir den ghl?as seo.<br>Mar sin f?in, fanfaidh na comhaid chriptithe ar an bhfreastala? agus ar do ghl?asanna eile go l?ir, m? t? siad cumraithe.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -893,34 +876,44 @@
<translation>T? an oibr?ocht sioncronaithe ar si?l.1 Ar mhaith leat deireadh a chur leis?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>% 1 (% 3%) de % 2 in ?s?id. D'fh?adfadh teorainneacha ?ags?la a bheith ag roinnt fillte?n, lena n-?ir?tear fillte?in l?onraithe n? fillte?in roinnte.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>% 1 in ?s?id</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>% 1 as % 2 in ?s?id</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>?osluchtaigh teastas chuig ceann nua</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>N?l aon fhaisn?is faoi ?s?id st?r?la ar f?il faoi l?thair.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>T? fillte?in ann a d'fh?s i m?id thar % 1MB: % 2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>% 1 in ?s?id</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation>T? cripti? ? cheann ceann tosaithe ar an gcuntas seo le gl?as eile.<br>Cuir isteach an cuimhneola?och uath?il chun na fillte?in chriptithe a shioncr?n? ar an ngl?as seo chomh maith.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>% 1 mar % 2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>Cumasa?odh cripti? ceann go ceann ar an gcuntas seo le gl?as eile.1 Is f?idir ? a chumas? ar an ngl?as seo tr? do chuimhneach?n a chur isteach.2 Cumas?idh s? seo sioncr?n? na bhfillte?n criptithe at? ann cheana f?in.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>N? thaca?tear le leagan freastala? % 1! Lean ar aghaidh ar do phriacal f?in.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation>Taca?onn an cuntas seo le cripti? ? cheann ceann, ach n? m?r ? a shocr? ar dt?s.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Socraigh cripti?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Taca?onn an cuntas seo le cripti? ceann go ceann</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -938,79 +931,125 @@
<translation>T? freastala? % 1 i m?d cothabh?la faoi l?thair.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>T? freastala? % 1 ? atreor? faoi l?thair, n? t? do cheangal taobh thiar de thairseach faoi chuing.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>S?nithe amach as % 1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Ag ceangal le % 1 ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>T? fillte?in ann n?r sioncrona?odh toisc go bhfuil siad r?mh?r:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>N? f?idir ceangal le % 1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>T? fillte?in ann n?r sioncrona?odh toisc gur st?rais sheachtracha iad:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Earr?id chumra?ocht an fhreastala?: % 1 ag % 2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>T? fillte?in ann n?r sioncrona?odh toisc go bhfuil siad r?mh?r n? mar st?rais sheachtracha:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>N? m?r duit glacadh leis na t?arma? seirbh?se ag %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Oscail fillte?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>N?l ceangal % 1 cumraithe.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Lean an sioncron?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>?osluchtaigh teastas chuig ceann nua</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Cuir an sioncron? ar sos</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>T? fillte?in ann n?r sioncrona?odh toisc go bhfuil siad r?mh?r:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>N?orbh fh?idir fillte?n log?nta <i>%1</i>.</p>a chruth?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>T? fillte?in ann n?r sioncrona?odh toisc gur st?rais sheachtracha iad:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Ar mhaith leat i nd?ir?re chun stop a syncing an fillte?n<i>%1</i>?</p><p><b>N?ta:</b> N? scriosfaidh s?<b>seo</b> aon chomhad.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>T? fillte?in ann n?r sioncrona?odh toisc go bhfuil siad r?mh?r n? mar st?rais sheachtracha:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>Chun d'Aitheantas Cripteagrafach a chosaint, d?anaimid ? a chripti? le cuimhneach?n de 12 fhocal focl?ra. Tabhair faoi deara iad seo agus coinnigh s?bh?ilte iad. Beidh siad ag teast?il chun gl?asanna eile a chur le do chuntas (cos?il le d?fh?n p?ca n? do r?omhaire gl?ine).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>T? fillte?in ann a d'fh?s i m?id thar % 1MB: % 2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>D?chumasaigh cripti? ceann go ceann</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>Cumasa?odh cripti? ceann go ceann ar an gcuntas seo le gl?as eile.1 Is f?idir ? a chumas? ar an ngl?as seo tr? do chuimhneach?n a chur isteach.2 Cumas?idh s? seo sioncr?n? na bhfillte?n criptithe at? ann cheana f?in.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>An bhfuil fonn ort an cripti? ceann go ceann do % 1 a dh?chumas??</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Taca?onn an cuntas seo le cripti? ceann go ceann</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>M? bhaintear cripti? ceann go ceann, bainfear comhaid at? sioncronaithe go h?iti?il agus at? criptithe.1 Fanfaidh comhaid criptithe ar an bhfreastala?.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Socraigh cripti?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>% 1 (% 3%) de % 2 in ?s?id. D'fh?adfadh teorainneacha ?ags?la a bheith ag roinnt fillte?n, lena n-?ir?tear fillte?in l?onraithe n? fillte?in roinnte.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>% 1 as % 2 in ?s?id</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>N?l aon fhaisn?is faoi ?s?id st?r?la ar f?il faoi l?thair.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>% 1 mar % 2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>N? thaca?tear le leagan freastala? % 1! Lean ar aghaidh ar do phriacal f?in.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>T? freastala? % 1 ? atreor? faoi l?thair, n? t? do cheangal taobh thiar de thairseach faoi chuing.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Ag ceangal le % 1 ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>N? f?idir ceangal le % 1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Earr?id chumra?ocht an fhreastala?: % 1 ag % 2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>N? m?r duit glacadh leis na t?arma? seirbh?se ag %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>N?l ceangal % 1 cumraithe.</translation>
</message>
</context>
<context>
@@ -1125,11 +1164,6 @@
<translation>Teastas & Eochair (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Brabhs?il?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Pasfhocal an teastais:</translation>
@@ -1140,6 +1174,11 @@
<translation>Moltar go l?idir beart pkcs12 criptithe mar go st?r?lfar c?ip sa chomhad cumra?ochta.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Brabhs?il?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Roghnaigh teastas</translation>
@@ -1190,34 +1229,34 @@
<translation>Lean ar aghaidh</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>% 1 cuntas</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 chuntas</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>% 1 fillte?n</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 fillte?n</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Iomp?rt?il oidhreachta</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1225,12 +1264,12 @@
% 3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Earr?id agus an comhad cumra?ochta ? rochtain</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>Tharla earr?id agus an comhad cumra?ochta ag % 1 ? rochtain. Cinntigh le do thoil gur f?idir an comhad a rochtain ag do chuntas c?rais.</translation>
</message>
@@ -1272,6 +1311,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation>T? an comhad athraithe ? aims?odh ?</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation>N?orbh fh?idir taifead comhaid %1 a scriosadh ?n mbunachar sonra? ?iti?il</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation>N? f?idir an comhad %1 a ?osl?d?il mar nach comhad f?or?il ?!</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation>N?orbh fh?idir comhad %1 a fh?il ?n mbunachar sonra? ?iti?il</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation>N? f?idir an comhad %1 a ?osl?d?il mar gheall ar fhaisn?is chriptithe at? ar iarraidh.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation>Earr?id ag nuashonr? meiteashonra?: %1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation>T? an comhad %1 in ?s?id faoi l?thair</translation>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1279,6 +1357,11 @@
<translation>N? f?idir comhad % 1 a uasl?d?il toisc go bhfuil comhad eile leis an ainm c?anna, difri?il ar eagla na heagla</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation>T? sp?sanna tosaigh n? deiridh sa chomhad agus n?orbh fh?idir ? a athainmni?</translation>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>T? am modhnaithe neamhbhail? i gcomhad % 1. N? uasl?d?il chuig an bhfreastala?.</translation>
@@ -1483,7 +1566,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Earr?id agus meiteashonra? ? scr?obh chuig an mbunachar sonra?</translation>
</message>
@@ -1613,21 +1696,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Ar mhaith leat eolaire <i>%1</i> agus a bhfuil ann go l?ir a scriosadh go buan?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Ar mhaith leat an comhad <i>%1</i> a scriosadh go buan?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Deimhnigh scriosadh</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1643,30 +1711,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>N?l cuntas Nextcloud cumraithe</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Ar mhaith leat eolaire <i>%1</i> agus a bhfuil ann go l?ir a scriosadh go buan?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Earr?id fh?ordheimhnithe: T? ainm ?s?ideora n? pasfhocal m?cheart.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Ar mhaith leat an comhad <i>%1</i> a scriosadh go buan?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Deimhnigh scriosadh</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Sos</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>N?l na dinti?ir a thugtar ceart</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>T? an freastala? cumraithe don chliant seo r?-shean</translation>
@@ -1676,16 +1744,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Nuashonraigh chuig an bhfreastala? is d?ana? agus atosaigh an cliant le do thoil.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Earr?id fh?ordheimhnithe: T? ainm ?s?ideora n? pasfhocal m?cheart.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>N?l cuntas Nextcloud cumraithe</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>N?l na dinti?ir a thugtar ceart</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Earr?id agus scriosadh comhaid ? chur ar ceal</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>Earr?id agus scriosadh % 1 ? cheal?</translation>
</message>
@@ -1693,19 +1776,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Earr?id fhreastala?: N?l an freagra PROPFIND form?idithe XML!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>Earr?id socraithe meiteashonra? criptithe!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>Earr?id socraithe meiteashonra? criptithe: t? s?ni? tosaigh an fhreastala? folamh.</translation>
</message>
@@ -1713,27 +1796,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Earr?id agus eolaire % 1 ? oscailt</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>N?l an t-eolaire inrochtana ag an gcliant, di?lta?odh cead</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Comhadlann gan aimsi?: % 1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>N?l ionch?d? ainm comhaid bail?</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Earr?id agus eolaire % 1 ? l?amh</translation>
</message>
@@ -1973,11 +2056,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>N? thosa?onn an URL v?ta?ochta le HTTPS in ainneoin gur thosaigh an URL log?il isteach le HTTPS. N? bheidh t? in ann log?il isteach toisc go bhf?adfadh gur ceist sl?nd?la ? seo. D?an teagmh?il le do riarth?ir.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>N? thosa?onn URL an fhreastala? ar ais le HTTPS in ainneoin gur thosaigh an URL log?il isteach le HTTPS. N? bheidh t? in ann log?il isteach toisc go bhf?adfadh gur ceist sl?nd?la ? seo. D?an teagmh?il le do riarth?ir le do thoil.</translation>
@@ -1989,28 +2067,33 @@
<translation>Earr?id aischurtha ?n bhfreastala?: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>N? thosa?onn an URL v?ta?ochta le HTTPS in ainneoin gur thosaigh an URL log?il isteach le HTTPS. N? bheidh t? in ann log?il isteach toisc go bhf?adfadh gur ceist sl?nd?la ? seo. D?an teagmh?il le do riarth?ir.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Tharla earr?id agus an cr?ochphointe "comhartha" ? rochtain:<br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>N?orbh fh?idir an JSON a cuireadh ar ais ?n bhfreastala? a phars?il: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>N? raibh gach r?imse ionchais sa fhreagra ?n bhfreastala?</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation>N? raibh gach r?imse ionchais sa fhreagra ?n bhfreastala?:<br><em>%1</em></translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>N?orbh fh?idir an JSON a cuireadh ar ais ?n bhfreastala? a phars?il: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2053,6 +2136,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>Baineadh % 1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>Nuashonra?odh % 1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>Athainmn?odh % 1 go % 2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>Bogadh % 1 go % 2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation><numerusform>Baineadh %1 agus %n comhad eile.</numerusform><numerusform>Baineadh %1 agus %n comhad eile.</numerusform><numerusform>Baineadh %1 agus %n comhad eile.</numerusform><numerusform>Baineadh %1 agus %n comhad eile.</numerusform><numerusform>Baineadh %1 agus %n comhad eile.</numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>Roghnaigh su?omh eile le do thoil. N?l fillte?n %1 ann.</translation>
@@ -2068,17 +2179,6 @@
<translation>Roghnaigh su?omh eile le do thoil. N? fillte?n inl?ite ? %1.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>Baineadh % 1 agus %n comhad(?) eile.</numerusform><numerusform>Baineadh % 1 agus %n comhad(?) eile.</numerusform><numerusform>Baineadh % 1 agus %n comhad(?) eile.</numerusform><numerusform>Baineadh % 1 agus %n comhad(?) eile.</numerusform><numerusform>Baineadh % 1 agus %n comhad(?) eile.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>Baineadh % 1.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>% 1 agus %n comhad(?) eile curtha leis.</numerusform><numerusform>% 1 agus %n comhad(?) eile curtha leis.</numerusform><numerusform>% 1 agus %n comhad(?) eile curtha leis.</numerusform><numerusform>% 1 agus %n comhad(?) eile curtha leis.</numerusform><numerusform>% 1 agus %n comhad(?) eile curtha leis.</numerusform></translation>
@@ -2094,33 +2194,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>Nuashonra?odh % 1 agus %n comhad(?) eile.</numerusform><numerusform>Nuashonra?odh % 1 agus %n comhad(?) eile.</numerusform><numerusform>Nuashonra?odh % 1 agus %n comhad(?) eile.</numerusform><numerusform>Nuashonra?odh % 1 agus %n comhad(?) eile.</numerusform><numerusform>Nuashonra?odh % 1 agus %n comhad(?) eile.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>Nuashonra?odh % 1.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>Athainmn?odh % 1 go % 2 agus %n comhad(?) eile athainmnithe.</numerusform><numerusform>Athainmn?odh % 1 go % 2 agus %n comhad(?) eile athainmnithe.</numerusform><numerusform>Athainmn?odh % 1 go % 2 agus %n comhad(?) eile athainmnithe.</numerusform><numerusform>Athainmn?odh % 1 go % 2 agus %n comhad(?) eile athainmnithe.</numerusform><numerusform>Athainmn?odh % 1 go % 2 agus %n comhad(?) eile athainmnithe.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>Athainmn?odh % 1 go % 2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>Bogadh % 1 go % 2 agus bogadh %n comhad eile.</numerusform><numerusform>Bogadh % 1 go % 2 agus bogadh %n comhad eile.</numerusform><numerusform>Bogadh % 1 go % 2 agus bogadh %n comhad eile.</numerusform><numerusform>Bogadh % 1 go % 2 agus bogadh %n comhad eile.</numerusform><numerusform>Bogadh % 1 go % 2 agus bogadh %n comhad eile.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>Bogadh % 1 go % 2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2157,68 +2240,68 @@
<translation>Gn?omha?ocht Sioncronaithe</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>N?orbh fh?idir an c?ras a l?amh agus an comhad a eisiamh</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Cuireadh fillte?n nua n?os m? n? % 1 MB leis: % 2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>T? fillte?n ? st?ras seachtrach curtha leis.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>T?igh isteach sna socruithe chun ? a roghn? m?s mian leat ? a ?osl?d?il le do thoil.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>Sh?raigh fillte?n an teorainn mh?id fillte?in de % 1MB: % 2.
% 3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>Coinnigh sioncron?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>Stop sioncron?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>Sh?raigh fillte?n % 1 an teorainn m?ide fillte?in de % 2MB.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>Ar mhaith leat stop a chur le sioncron? an fhillte?in seo?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Crutha?odh fillte?n % 1 ach f?gadh as an ?ireamh ? ?n sioncron? roimhe seo. N? dh?anfar sonra? taobh istigh de a shioncron?.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Crutha?odh comhad % 1 ach f?gadh as an ?ireamh ? ?n sioncron? roimhe seo. N? dh?anfar ? a shioncron?.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2231,12 +2314,12 @@
% 1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>Theip ar ?oslucht? an chomhaid fh?or?il le c?d "% 1", st?das "% 2" agus teachtaireacht earr?ide "% 3"</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2245,7 +2328,7 @@
N?, is f?idir leat gach comhad scriosta a chur ar ais tr? uasl?d?il ? fhillte?n '%1' go dt? an freastala?.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2254,22 +2337,22 @@
De rogha air sin, is f?idir leat gach comhad a scriosadh a chur ar ais tr?na n-?osl?d?il ?n bhfreastala?.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>Bain gach comhad?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>Lean ar aghaidh leis an Scriosadh</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>Athch?irigh Comhaid go Freastala?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>Athch?irigh Comhaid ?n bhfreastala?</translation>
</message>
@@ -2310,11 +2393,6 @@
<translation>N?orbh fh?idir staid an fhillte?in a athshocr?</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>Fuarthas sean dialann sioncronaithe "% 1", ach n?orbh fh?idir ? a bhaint. Cinntigh le do thoil nach bhfuil aon fheidhmchl?r ? ?s?id faoi l?thair.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(c?ltaca)</translation>
@@ -2325,6 +2403,11 @@
<translation>(c?ltaca % 1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>Fuarthas sean dialann sioncronaithe "% 1", ach n?orbh fh?idir ? a bhaint. Cinntigh le do thoil nach bhfuil aon fheidhmchl?r ? ?s?id faoi l?thair.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Staid neamhshainithe.</translation>
@@ -2395,16 +2478,6 @@
<translation>Cuireadh an t-iarratas sioncronaithe ar ceal.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>T? an sioncron? ar sos.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>% 1 (T? an sioncron? curtha ar sos)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>Roghnaigh su?omh eile le do thoil. N?l an fillte?n roghnaithe bail?.</translation>
@@ -2454,6 +2527,16 @@
Chun an fhadhb seo a r?iteach: bain %1 de cheann de na cuntais agus cruthaigh fillte?n sioncronaithe nua.
D'?s?ideoir? ardleibh?il: d'fh?adfadh an cheist seo a bheith bainteach le comhaid bunachar sonra? sioncronaithe iolracha a aims?odh i bhfillte?n amh?in. Seice?il %1 le haghaidh comhaid .sync_*.db at? as d?ta agus nach bhfuil in ?s?id agus bain amach iad.</translation>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>T? an sioncron? ar sos.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>% 1 (T? an sioncron? curtha ar sos)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2497,16 +2580,6 @@
<translation>Earr?id agus liosta na bhfillte?n ? l?d?il ?n bhfreastala?.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Liosta fillte?n ? fh?il ?n bhfreastala??</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>T? coinbhleachta? gan r?iteach. Clice?il le haghaidh sonra?.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>T? taca?ocht comhaid fh?or?il cumasaithe.</translation>
@@ -2548,16 +2621,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>?osl?d?il % 1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>Comhad % 1 de % 2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>T? coinbhleachta? gan r?iteach. Clice?il le haghaidh sonra?.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>?osl?d?il % 1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Liosta fillte?n ? fh?il ?n bhfreastala??</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2604,21 +2692,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>% 1 de % 2, comhad % 3 de % 4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>Comhad % 1 de % 2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>Ag fanacht le % i bhfillte?in eile ?</numerusform><numerusform>Ag fanacht le % i bhfillte?in eile ?</numerusform><numerusform>Ag fanacht le % i bhfillte?in eile ?</numerusform><numerusform>Ag fanacht le % i bhfillte?in eile ?</numerusform><numerusform>Ag fanacht le % i bhfillte?in eile ?</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>Ar t? sioncron? a thos?</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>Ag fanacht le % i bhfillte?in eile ?</numerusform><numerusform>Ag fanacht le % i bhfillte?in eile ?</numerusform><numerusform>Ag fanacht le % i bhfillte?in eile ?</numerusform><numerusform>Ag fanacht le % i bhfillte?in eile ?</numerusform><numerusform>Ag fanacht le % i bhfillte?in eile ?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2778,11 +2861,6 @@
<translation>Socruithe Ginear?lta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Seol ar Thos? an Ch?rais</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>Taispe?in F?gra? Glaonna</translation>
@@ -2793,11 +2871,6 @@
<translation>Le haghaidh Tr?idire C?rais</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>?s?id &Deilbh?n? Monacr?macha</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>Taispe?in F?gra? Comhr?</translation>
@@ -2813,17 +2886,32 @@
<translation>Casta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Iarr deimhni? sula nd?antar fillte?in nua at? n?os m? n? a shioncron?</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Iarr deimhni? sula nd?antar st?rais sheachtracha a shioncron?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Seol ar Thos? an Ch?rais</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>?s?id &Deilbh?n? Monacr?macha</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Iarr deimhni? sula nd?antar fillte?in nua at? n?os m? n? a shioncron?</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>F?gra a thabhairt nuair a fh?sann fillte?in sioncronaithe n?os m? n? an teorainn shonraithe</translation>
@@ -2834,11 +2922,6 @@
<translation>D?chumasaigh go huathoibr?och sioncr?n? fillte?n a sh?ra?onn teorainn</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Iarr deimhni? sula nd?antar st?rais sheachtracha a shioncron?</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>Bog comhaid bainte go dt? an bruscar</translation>
@@ -2890,11 +2973,6 @@
<translation>Nuashonraigh cain?al</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Atosaigh && Nuashonraigh</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>Seice?il go huathoibr?och le haghaidh nuashonruithe</translation>
@@ -2915,6 +2993,16 @@
<translation>F?gra Dl?thi?il</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation>Athch?irigh &R?amhshocr?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Atosaigh && Nuashonraigh</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>F?gra? freastala? a dteasta?onn aird uathu.</translation>
@@ -2935,6 +3023,11 @@
<translation>N? f?idir leat uath-th?s a dh?chumas? toisc go bhfuil uath-t?s ar fud an ch?rais cumasaithe.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation>Athch?irigh go &%1</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>cobhsa?</translation>
@@ -3016,6 +3109,11 @@
<source>Debug archive is created at %1</source>
<translation>Crutha?tear cartlann d?fhabhtaithe ag % 1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation>Cuir faisn?is ?ogair in eagar sula nd?antar ? a roinnt! Cartlann d?fhabhtaithe cruthaithe ag %1</translation>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3180,102 +3278,97 @@
<translation>Ainm comhaid nua</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Athainmnigh an comhad</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>N?orbh fh?idir comhad "% 1" a shioncron? toisc go bhfuil carachtair san ainm nach bhfuil ceadaithe ar an gc?ras seo.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>N? cheada?tear na carachtair seo a leanas ar an gc?ras: * " | & ? , ; : \ / ~ < > sp?sanna tosaigh/leant?ir</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation>N? cheada?tear na carachtair seo a leanas ar an gc?ras: \ / : ? * " < > | sp?sanna tosaigh/i ndiaidh a ch?ile</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>N?orbh fh?idir comhad "%1" a shioncron? toisc go bhfuil carachtair san ainm nach bhfuil ceadaithe ar an bhfreastala?.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>N? cheada?tear na carachtair seo a leanas: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>N? cheada?tear na bunainmneacha seo a leanas: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>N? cheada?tear na hainmneacha comhaid seo a leanas: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>N? cheada?tear na hiarmh?reanna comhaid seo a leanas: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Ceadanna athainmnithe ? seice?il?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>N?l cead agat an comhad seo a athainmni?. Iarr ar ?dar an chomhaid ? a athainmni? le do thoil. </translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>N?orbh fh?idir ceadanna a fh?il le hearr?id % 1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>T? sp?sanna tosaigh agus sp?sanna rianaithe sa chomhadainm.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>T? sp?sanna tosaigh san ainm comhaid.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>T? sp?sanna lean?nacha san ainm comhaid.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>?s?id ainm neamhbhail?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>T? carachtair mh?dhleathacha san ainm comhaid: % 1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>N?orbh fh?idir an comhad a athainmni?. Cinntigh go bhfuil t? ceangailte leis an bhfreastala? le do thoil.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>N? f?idir an comhad a athainmni? toisc go bhfuil comhad leis an ainm c?anna ar an bhfreastala? cheana f?in. Roghnaigh ainm eile le do thoil.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>N?orbh fh?idir an comhad ?iti?il a athainmni?. % 1</translation>
</message>
@@ -3399,16 +3492,6 @@
<translation><p>T? leagan nua de Chliant %1 ar f?il.</p><p><b>%2</b> ar f?il le h?osl?d?il. Is ? %3</p>an leagan suite?ilte.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Scipe?il an uair seo</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Faigh nuashonr?</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>Theip ar an Nuashonr?</translation>
@@ -3433,6 +3516,16 @@
<source>Update manually</source>
<translation>Nuashonraigh de l?imh</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Scipe?il an uair seo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Faigh nuashonr?</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3457,6 +3550,23 @@
<translation>Teasta?onn f?ordheimhni? ?n seachfhreastala?</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>?osl?d?il Bandaleithid</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Teorainn le</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBiteanna/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>N?ta: n?l aon ?ifeachta? ag socruithe seachfhreastala? do chuntais ar localhost</translation>
@@ -3479,46 +3589,29 @@
<translation>?s?id socruithe domhanda</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>?osl?d?il Bandaleithid</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Gan teorainn</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBiteanna/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Teorainn le</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Teorainn go 3/4 den bhandaleithead measta</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Uasl?d?il Bandaleithid</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Teorainn go huathoibr?och</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Uasl?d?il Bandaleithid</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Ainm an seachfhreastala?</translation>
@@ -3547,6 +3640,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>N?orbh fh?idir nuashonruithe nua a sheice?il.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Freastala? nuashonraithe ? sheice?il?</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>Nuashonr? nua % 1 r?idh</translation>
@@ -3577,11 +3680,6 @@
<translation>N?orbh fh?idir an nuashonr? a ?osl?d?il. Oscail % 1 chun an nuashonr? a ?osl?d?il de l?imh le do thoil.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>N?orbh fh?idir nuashonruithe nua a sheice?il.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>T? % 1 nua ar f?il. Oscail 1%<a href='%2'>%2</a> chun an nuashonr? a ?osl?d?il le do thoil.</translation>
@@ -3592,16 +3690,21 @@
<translation>T? % 1 nua ar f?il. Oscail % 2 chun an nuashonr? a ?osl?d?il le do thoil.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Freastala? nuashonraithe ? sheice?il?</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>N? fios st?das an nuashonraithe: N?or sheice?il le haghaidh nuashonruithe nua.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation>T? t? ag ?s?id an chain?al nuashonraithe %1. Is ? an leagan is d?ana? at? suite?ilte agat.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation>N?l aon nuashonruithe ar f?il. Is ? an leagan is d?ana? at? suite?ilte agat.</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>N?l aon nuashonruithe ar f?il. T? do shuite?il ag an leagan is d?ana?.</translation>
@@ -3777,11 +3880,6 @@
<translation><font color="green">Ceangail go rath?il le %1: %2 leagan %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>URL neamhbhail?</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Theip ar nascadh le %1 ag %2:<br/>%3</translation>
@@ -3792,6 +3890,16 @@
<translation>Teorainn ama agus iarracht ? d?anamh ceangal le %1 ag %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Rochtain toirmiscthe ag an bhfreastala?. Chun a fh?or? go bhfuil rochtain cheart agat, <a href="%1">clice?il anseo</a> chun an tseirbh?s a rochtain le do bhrabhs?la?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>URL neamhbhail?</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Ag iarraidh ceangal le % 1 ag % 2 ?</translation>
@@ -3802,11 +3910,6 @@
<translation>Atreora?odh an t-iarratas f?ordheimhnithe chuig an bhfreastala? go "% 1". T? an URL olc, t? an freastala? m?chumraithe.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Rochtain toirmiscthe ag an bhfreastala?. Chun a fh?or? go bhfuil rochtain cheart agat, <a href="%1">clice?il anseo</a> chun an tseirbh?s a rochtain le do bhrabhs?la?.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>Bh? freagra neamhbhail? ar iarratas f?ordheimhnithe WebDAV</translation>
@@ -4018,62 +4121,34 @@
<translation>N? thaca?tear le hainmneacha comhaid a chr?ochna?onn le tr?imhse ar an gc?ras comhad seo.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Fillte?n</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Comhad</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation>N? thaca?tear le hainmneacha fillte?n ina bhfuil an carachtar "%1" ar an gc?ras comhad seo.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>N? thaca?tear le % 1 ainm ina bhfuil an carachtar "% 2" ar an gc?ras comhad seo.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation>N? thaca?tear le hainmneacha comhad ina bhfuil an carachtar "%1" ar an gc?ras comhad seo.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>T? carachtar neamhbhail? amh?in ar a laghad in ainm % 1</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation>T? carachtar neamhbhail? amh?in ar a laghad in ainm an fhillte?in</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>Is ainm forchoime?dta ? % 1 ar an gc?ras comhad seo.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>T? carachtar neamhbhail? amh?in ar a laghad san ainm comhaid</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation>Is ainm curtha in ?irithe ar an gc?ras comhad seo ? ainm an fhillte?in.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation>Is ainm in ?irithe ? ainm comhaid ar an gc?ras comhad seo.</translation>
</message>
@@ -4083,6 +4158,24 @@
<translation>T? sp?sanna lean?nacha san ainm comhaid.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Fillte?n</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Comhad</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>N? thaca?tear le % 1 ainm ina bhfuil an carachtar "% 2" ar an gc?ras comhad seo.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4091,6 +4184,16 @@
<translation>N? f?idir ? a athainmni? n? a uasl?d?il.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>T? carachtar neamhbhail? amh?in ar a laghad in ainm % 1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>Is ainm forchoime?dta ? % 1 ar an gc?ras comhad seo.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>T? sp?sanna tosaigh san ainm comhaid.</translation>
@@ -4181,64 +4284,74 @@
<translation>N?or thuairiscigh freastala? % 1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>N? f?idir sioncron? a dh?anamh mar gheall ar am modhnuithe neamhbhail?</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation>T? uasl?d?il %1 n?os m? n? %2 den sp?s at? f?gtha i gcomhaid phearsanta.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation>T? uasl?d?il %1 n?os m? n? %2 den sp?s at? f?gtha i bhfillte?n %3.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>N?orbh fh?idir an comhad a uasl?d?il toisc go bhfuil s? oscailte i "% 1".</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>Earr?id agus taifead comhaid % 1 ? scriosadh ?n mbunachar sonra?</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>Bogtha go dt? an sprioc neamhbhail?, ? athch?iri?</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>N? f?idir an mh?r chriptithe a mhionathr? toisc nach bhfuil an teastas roghnaithe bail?.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Rinneadh neamhaird de mar gheall ar an liosta dubh "roghnaigh cad ba cheart a shioncron?".</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>N? cheada?tear toisc nach bhfuil cead agat fofhillte?in a chur leis an bhfillte?n sin</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>N? cheada?tear toisc nach bhfuil cead agat comhaid a chur san fhillte?n sin</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>N? cheada?tear an comhad seo a uasl?d?il toisc go bhfuil s? inl?ite amh?in ar an bhfreastala?, ? athch?iri?</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>N? cheada?tear a bhaint, a athch?iri?</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Earr?id agus an bunachar sonra? ? l?amh</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>D'fhreagair an freastala? le earr?id agus eolaire "% 1" ? l?amh : % 2</translation>
</message>
@@ -4246,38 +4359,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>N?orbh fh?idir comhad %1 a scriosadh ? DB log?nta</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>Earr?id agus meiteashonra? ? nuashonr? mar gheall ar am modhnuithe neamhbhail?</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>N? f?idir fillte?n % 1 a dh?anamh inl?ite amh?in: % 2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>eisceacht anaithnid</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Earr?id agus meiteashonra? ? nuashonr?: % 1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>T? an comhad in ?s?id faoi l?thair</translation>
</message>
@@ -4295,12 +4408,6 @@
<translation>N? f?idir comhad % 1 a ?osl?d?il toisc go bhfuil faisn?is chripti?ch?in in easnamh.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>T? an comhad athraithe ? aims?odh ?</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4357,6 +4464,12 @@
<source>The file %1 is currently in use</source>
<translation>T? comhad % 1 in ?s?id faoi l?thair</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>T? an comhad athraithe ? aims?odh ?</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4374,39 +4487,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>N?orbh fh?idir comhad % 1 a scriosadh, earr?id: % 2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>N? f?idir fillte?n % 1 a chruth? mar gheall ar choimhlint ainm comhaid log?nta n? fillte?in!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>N?orbh fh?idir fillte?n % 1 a chruth?</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>N? f?idir fillte?n % 1 a dh?anamh inl?ite amh?in: % 2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>eisceacht anaithnid</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Earr?id agus meiteashonra? ? nuashonr?: % 1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>T? comhad % 1 in ?s?id faoi l?thair</translation>
</message>
@@ -4419,14 +4532,14 @@
<translation>N?orbh fh?idir % 1 a bhaint mar gheall ar chlais ainm comhaid log?nta</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation>Earr?id shealadach agus an mh?r log?nta bainte den fhreastala? ? bhaint.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>N?orbh fh?idir taifead comhaid % 1 a scriosadh ? DB log?nta</translation>
</message>
@@ -4434,49 +4547,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>N? f?idir fillte?n % 1 a athainmni? mar gheall ar choimhlint ainm comhaid log?nta n? fillte?in!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>?osl?d?ilte comhad % 1 ach bh? clash ainm comhaid log?nta mar thoradh air!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>N?orbh fh?idir comhad %1 a fh?il ? DB log?nta</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Earr?id agus staid an phionna ? shocr?</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Earr?id agus meiteashonra? ? nuashonr?: % 1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>T? comhad % 1 in ?s?id faoi l?thair</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>Theip ar iomada?odh athainmni? an chomhadlainne san ordlathas</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Theip ar an gcomhad a athainmni?</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>N?orbh fh?idir taifead comhaid % 1 a scriosadh ? DB log?nta</translation>
</message>
@@ -4533,39 +4646,39 @@
<translation>N?orbh fh?idir % 1 a athainmni? go % 2, earr?id: % 3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Earr?id agus meiteashonra? ? nuashonr?: % 1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>T? comhad % 1 in ?s?id faoi l?thair</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>C?d HTTP m?cheart curtha ar ais ag an bhfreastala?. Bh?othas ag s?il le 201, ach fuarthas "% 1 % 2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>N?orbh fh?idir comhad %1 a fh?il ? DB log?nta</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>N?orbh fh?idir taifead comhaid % 1 a scriosadh ? DB log?nta</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Earr?id agus staid an phionna ? shocr?</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Earr?id agus meiteashonra? ? scr?obh chuig an mbunachar sonra?</translation>
</message>
@@ -4573,22 +4686,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>Theip ar uasl?d?il an chomhaid chriptithe.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>N? f?idir comhad % 1 a uasl?d?il toisc go bhfuil comhad eile leis an ainm c?anna, difri?il ar eagla na heagla</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>S?ra?onn uasl?d?il % 1 cu?ta an fhillte?in</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4596,11 +4698,6 @@
<translation>T? am modhnuithe neamhbhail? ag comhad % 1. N? uasl?d?il chuig an bhfreastala?.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Baineadh an Comhad (t?s le huasl?d?il) % 1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Athra?odh an comhad ?iti?il le linn sioncronaithe. Atos?far ?.</translation>
@@ -4630,6 +4727,22 @@
<source>The file %1 is currently in use</source>
<translation>T? comhad % 1 in ?s?id faoi l?thair</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>S?ra?onn uasl?d?il % 1 cu?ta an fhillte?in</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>Theip ar uasl?d?il an chomhaid chriptithe.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Baineadh an Comhad (t?s le huasl?d?il) % 1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4878,6 +4991,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Comhth?acs roghchl?ir a roinnt</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Roinn m? rud ?igin leat</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Comhroinn roghanna</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Seol nasc pr?obh?ideach tr? r?omhphost?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>C?ipe?il nasc pr?obh?ideach chuig an ngearrthaisce</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>Theip ar an bhfillte?n a chripti? ag "% 1"</translation>
@@ -4912,43 +5051,17 @@
<translation>D'?irigh leis an bhfillte?n seo a leanas a chripti?: "% 1"</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Comhth?acs roghchl?ir a roinnt</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Roghnaigh su?omh nua?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Roinn m? rud ?igin leat</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Comhroinn roghanna</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Gn?omha?ocht</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>C?ipe?il nasc pr?obh?ideach chuig an ngearrthaisce</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Seol nasc pr?obh?ideach tr? r?omhphost?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>F?g an sciar seo</translation>
@@ -4964,11 +5077,6 @@
<translation>N? cheada?tear an fillte?n seo a athroinnt</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>C?ipe?il an nasc inmhe?nach</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>Criptigh</translation>
@@ -4995,12 +5103,6 @@
<translation><numerusform>Rachaidh s? in ?ag i gceann % 1 n?im?ad</numerusform><numerusform>Rachaidh s? in ?ag i gceann % 1 n?im?ad</numerusform><numerusform>Rachaidh s? in ?ag i gceann % 1 n?im?ad</numerusform><numerusform>Rachaidh s? in ?ag i gceann % 1 n?im?ad</numerusform><numerusform>Rachaidh s? in ?ag i gceann % 1 n?im?ad</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Oscail sa bhrabhs?la?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>R?itigh coinbhleacht?</translation>
@@ -5030,6 +5132,17 @@
<source>Delete</source>
<translation>Scrios</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>C?ipe?il an nasc inmhe?nach</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Oscail sa bhrabhs?la?</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5131,13 +5244,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>NACH bhfuil an nasc seo sl?n mar n?l s? criptithe.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Leagan an fhreastala?: % 1</translation>
@@ -5157,6 +5263,13 @@
<source>The connection is not secure</source>
<translation>N?l an nasc sl?n</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>NACH bhfuil an nasc seo sl?n mar n?l s? criptithe.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5249,6 +5362,32 @@
<translation>% 1 (scipe?ladh mar gheall ar earr?id n?os luaithe, ag iarraidh ar?s i % 2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>N?l ach % 1 ar f?il, teasta?onn % 2 ar a laghad chun tos?</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>N? f?idir an bunachar sonra? sioncronaithe ?iti?il a oscailt n? a chruth?. Cinntigh go bhfuil rochtain scr?ofa agat san fhillte?n sioncronaithe.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>T? sp?s diosca ?seal: N? raibh ?oslucht? d?anta a laghd?dh sp?s saor faoi % 1.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>N?l go leor sp?is ar f?il ar an bhfreastala? le haghaidh roinnt uasl?d?la.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Coimhlint gan r?iteach.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>N?orbh fh?idir an comhad a nuashonr?: % 1</translation>
@@ -5269,22 +5408,6 @@
<translation>N?orbh fh?idir taifead comhaid a shocr? go DB log?nta: % 1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Coimhlint gan r?iteach.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>N?l ach % 1 ar f?il, teasta?onn % 2 ar a laghad chun tos?</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>N? f?idir an bunachar sonra? sioncronaithe ?iti?il a oscailt n? a chruth?. Cinntigh go bhfuil rochtain scr?ofa agat san fhillte?n sioncronaithe.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Comhaid fh?or?la a ?s?id le hiarmh?r, ach n?l iarmh?r socraithe</translation>
@@ -5304,16 +5427,6 @@
<source>Cannot open the sync journal</source>
<translation>N? f?idir an dialann sioncronaithe a oscailt</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>T? sp?s diosca ?seal: N? raibh ?oslucht? d?anta a laghd?dh sp?s saor faoi % 1.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>N?l go leor sp?is ar f?il ar an bhfreastala? le haghaidh roinnt uasl?d?la.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5324,7 +5437,7 @@
<translation>As l?ne</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>N? m?r duit glacadh leis na t?arma? seirbh?se</translation>
</message>
@@ -5708,11 +5821,6 @@
<source>Less than a minute</source>
<translation>N?os l? n? n?im?ad</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation><numerusform>%n n?im?ad</numerusform><numerusform>%n n?im?ad</numerusform><numerusform>%n n?im?ad</numerusform><numerusform>%n n?im?ad</numerusform><numerusform>%n n?im?ad</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5720,20 +5828,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation><numerusform>%n uair(eanna)</numerusform><numerusform>%n uair(eanna)</numerusform><numerusform>%n uair(eanna)</numerusform><numerusform>%n uair(eanna)</numerusform><numerusform>%n uair(eanna)</numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1 n?im?ad</numerusform><numerusform>%1 n?im?ad</numerusform><numerusform>%1 n?im?ad</numerusform><numerusform>%1 n?im?ad</numerusform><numerusform>%1 n?im?ad</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation><numerusform>%n l?(anna)</numerusform><numerusform>%n l?(anna)</numerusform><numerusform>%n l?(anna)</numerusform><numerusform>%n l?(anna)</numerusform><numerusform>%n l?(anna)</numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1 uair an chloig</numerusform><numerusform>%1 uair an chloig</numerusform><numerusform>%1 uair an chloig</numerusform><numerusform>%1 uair an chloig</numerusform><numerusform>%1 uair an chloig</numerusform></translation>
@@ -5748,6 +5846,21 @@
<source>%1 days</source>
<translation><numerusform>%1 laethanta</numerusform><numerusform>%1 laethanta</numerusform><numerusform>%1 laethanta</numerusform><numerusform>%1 laethanta</numerusform><numerusform>%1 laethanta</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation><numerusform>%n n?im?ad</numerusform><numerusform>%n n?im?ad</numerusform><numerusform>%n n?im?ad</numerusform><numerusform>%n n?im?ad</numerusform><numerusform>%n n?im?ad</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n uair(eanna)</numerusform><numerusform>%n uair(eanna)</numerusform><numerusform>%n uair(eanna)</numerusform><numerusform>%n uair(eanna)</numerusform><numerusform>%n uair(eanna)</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n l?(anna)</numerusform><numerusform>%n l?(anna)</numerusform><numerusform>%n l?(anna)</numerusform><numerusform>%n l?(anna)</numerusform><numerusform>%n l?(anna)</numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5890,6 +6003,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>S?nigh isteach le do thoil</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>N?l aon fillte?in sioncronaithe cumraithe.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>D?cheangailte ? % 1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Leagan Freastala? gan taca?ocht</translation>
@@ -5910,31 +6038,6 @@
<translation>?il?onn do chuntas %1 go nglacann t? le t?arma? seirbh?se do fhreastala?. D?anfar t? a atreor? chuig %2 chun a admh?il gur l?igh t? ? agus go n-aonta?onn t? leis.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>D?cheangailte ? % 1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>D?cheangailte ? chuntais:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Cuntas % 1: % 2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>S?nigh isteach le do thoil</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>T? sioncron? cuntais d?chumasaithe</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5956,11 +6059,6 @@
<translation>macOS VFS le haghaidh % 1: Th?ngthas ar fhadhb.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>N?l aon fillte?in sioncronaithe cumraithe.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Ag seice?il le haghaidh athruithe i gcian"% 1"</translation>
@@ -5971,6 +6069,21 @@
<translation>Ag seice?il le haghaidh athruithe i log?nta "% 1"</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>D?cheangailte ? chuntais:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Cuntas % 1: % 2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>T? sioncron? cuntais d?chumasaithe</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5979,11 +6092,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Fillte?n ?iti?il</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Ainm ?s?ideora</translation>
@@ -6019,22 +6127,11 @@
<translation>Fiafraigh roimh shioncron? fillte?in n?os m? n?</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Fiafraigh sula nd?antar st?rais sheachtracha a shioncron?</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Roghnaigh cad at? le sioncron?</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Coinnigh sonra? ?iti?la</translation>
@@ -6049,6 +6146,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Scrios an fillte?n ?iti?il agus cuir t?s le sioncron? glan</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Roghnaigh cad at? le sioncron?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Fillte?n ?iti?il</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6089,6 +6202,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>% nd</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>sa todhcha?</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1m</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>anois</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Tamall ? shin</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6129,57 +6287,12 @@
<source>Synced %1</source>
<translation>Sioncronaithe % 1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>% nd</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>sa todhcha?</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>anois</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1m</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Tamall ? shin</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation>Earr?id agus an comhad ? scriosadh</translation>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>N? thaca?tear le conair? a thosa?onn le carachtar '#' sa mh?d VFS.</translation>
@@ -6425,6 +6538,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>Oscail fillte?in ?iti?la n? gr?pa</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Oscail fillte?n ?iti?il</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Ceangailte</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>D?cheangailte</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>Oscail fillte?n log?nta"% 1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>Oscail fillte?n gr?pa"% 1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>Oscail % 1 i taisc?ala? comhad</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>Roghchl?r gr?pa ?s?ideoir? agus fillte?in ?iti?la</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6614,16 +6770,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6638,6 +6784,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6871,16 +7027,16 @@
<translation>Tharla earr?id le linn an tsocraithe</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Ag ullmh? chun sioncronaithe</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>Sioncron? ? stopadh</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Ag ullmh? chun sioncronaithe</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>T? an sioncron? ar sos</translation>
@@ -6939,4 +7095,17 @@
<translation>Saor suas sp?s ?iti?il</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>Cumasaigh sioncron? tapa</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>N? dh?anfaidh sioncron? tapa ach athruithe ar chomhaid agus ar fhillte?in a shioncron? laistigh d'fhillte?in a ndearnadh ini?chadh orthu. Is f?idir leis seo freagr?lacht a mh?ad? go suntasach ar chumra?ocht tosaigh comhaid fh?or?la. Mar sin f?in, beidh s? ina ch?is le h?osl?d?lacha iomarcacha de chomhaid a aistr?odh chuig fillte?n neamhscr?daithe.</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_gl.ts nextcloud-desktop-3.16.6/translations/client_gl.ts
--- nextcloud-desktop-3.16.4/translations/client_gl.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_gl.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>Activar a sincronizaci?n r?pida</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>A sincronizaci?n r?pida s? sincronizar? os cambios nos ficheiros e cartafoles dos cartafoles que se examinaron. Isto pode aumentar significativamente a capacidade de resposta na configuraci?n inicial dos ficheiros virtuais. Por?n, provocar? descargas redundantes de ficheiros movidos a un cartafol non examinado.</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>Activar ficheiros virtuais</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -558,7 +550,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Importar estilo antigo</translation>
</message>
@@ -573,7 +565,7 @@
<translation>Omitir</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>Non foi pos?bel importar contas da configuraci?n do cliente estilo antigo.</translation>
</message>
@@ -581,33 +573,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Espazo de almacenamento:?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Os cartafoles non seleccionados van sere <b>retirados</b> do seu sistema de ficheiros local e non volver?n sincronizarse con este computador</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Cancelar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Aplicar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Conectado con <server> como <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Sincronizar todo</translation>
@@ -638,6 +608,33 @@
<translation>Axustes da conexi?n</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Aplicar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Espazo de almacenamento:?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Cancelar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Conectado con <server> como <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Non hai contas configuradas.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>Cifrado de extremo a extremo con ficheiros virtuais</translation>
@@ -672,9 +669,9 @@
<b>Este proceso non ? revers?bel. Confirma que quere continuar?</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Non hai contas configuradas.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -687,6 +684,11 @@
<translation>Amosar o mnem?nico</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>Activouse o cifrado de extremo a extremo para esta conta</translation>
@@ -712,6 +714,12 @@
<translation>O cartafol ten un erro de sincronizaci?n. O cifrado deste cartafol ser? pos?bel unha vez que se sincronice correctamente</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -736,12 +744,6 @@
<translation>Non foi pos?bel cifrar o cartafol porque o cartafol xa non existe</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Abrir o cartafol</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Cifrar</translation>
@@ -780,16 +782,6 @@
<translation>Reiniciar a sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Continuar coa sincronizaci?n</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Pausar a sincronizaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Retirar a conexi?n da sincronizaci?n do cartafol</translation>
@@ -815,21 +807,11 @@
<translation>Produciuse un fallo ao crear o cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Non foi pos?bel crear o cartafol local <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar a retirada da conexi?n da sincronizaci?n do cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Confirma que quere deixar de sincronizar o cartafol <i>%1</i>?</p><p><b>Aviso:</b> Isto <b>non</b> eliminar? ning?n ficheiro.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Retirar a conexi?n da sincronizaci?n do cartafol</translation>
@@ -863,24 +845,24 @@
<translation>Mnem?nico de cifrado de extremo a extremo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>Para protexer a s?a identidade criptogr?fica, cifr?mola cun mnemot?cnico de 12 palabras do dicionario. An?teas a po?as a seguro. Ser?n necesarias para engadir outros dispositivos ? s?a conta (como o seu tel?fono m?bil ou o computador port?til).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>Desactivar o cifrado de extremo a extremo</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>Desactivar o cifrado de extremo a extremo para %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>Ao retirar o cifrado de extremo a extremo, retiraranse os ficheiros sincronizados localmente que est?n cifrados.<br>Os ficheiros cifrados permanecer?n no servidor.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -893,34 +875,44 @@
<translation>Estase a realizar a sincronizaci?n.<br/>Quere interrompela e rematala?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) de %2 en uso. Alg?ns cartafoles, inclu?ndo os compartidos e os montados en rede, poder?an ter diferentes l?mites.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 de %2 en uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>Migrar o certificado cara a un novo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Actualmente non hai dispo??bel ningunha informaci?n sobre o uso do almacenamento.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>Hai cartafoles que creceron m?is al? de %1MB: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 en uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 como %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>Activouse o cifrado de extremo a extremo nesta conta con outro dispositivo.<br> P?dese activar neste dispositivo introducindo o seu mnemot?cnico.<br> Isto activar? a sincronizaci?n dos cartafoles cifrados existentes.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>Este servidor da versi?n %1 non ten asistencia t?cnica! Proceda baixo a s?a propia responsabilidade.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Definir o cifrado</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Esta conta admite o cifrado de extremo a extremo</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -938,79 +930,125 @@
<translation>O servidor %1 neste momento est? en modo de mantemento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>O servidor % 1 est? a ser redirixido ou a s?a conexi?n est? detr?s dun portal cativo.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Desconectado de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Conectando con %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Hai cartafoles que non se sincronizaron por ser demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>Non ? pos?bel conectar con %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Hai cartafoles que non se sincronizaron porque son almacenamentos externos:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Produciuse un erro de configuraci?n do servidor: %1 en %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Hai cartafoles que non se sincronizaron porque son demasiado grandes ou almacenamentos externos:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>? preciso que Vde. acepte as condici?ns de servizo en %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Abrir o cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Non se configurou a conexi?n %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Continuar coa sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>Migrar o certificado cara a un novo</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Pausar a sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Hai cartafoles que non se sincronizaron por ser demasiado grandes:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Non foi pos?bel crear o cartafol local <i>%1</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Hai cartafoles que non se sincronizaron porque son almacenamentos externos:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Confirma que quere deixar de sincronizar o cartafol <i>%1</i>?</p><p><b>Aviso:</b> Isto <b>non</b> eliminar? ning?n ficheiro.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Hai cartafoles que non se sincronizaron porque son demasiado grandes ou almacenamentos externos:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>Para protexer a s?a identidade criptogr?fica, cifr?mola cun mnemot?cnico de 12 palabras do dicionario. An?teas a po?as a seguro. Ser?n necesarias para engadir outros dispositivos ? s?a conta (como o seu tel?fono m?bil ou o computador port?til).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>Hai cartafoles que creceron m?is al? de %1MB: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>Desactivar o cifrado de extremo a extremo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>Activouse o cifrado de extremo a extremo nesta conta con outro dispositivo.<br> P?dese activar neste dispositivo introducindo o seu mnemot?cnico.<br> Isto activar? a sincronizaci?n dos cartafoles cifrados existentes.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>Desactivar o cifrado de extremo a extremo para %1?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Esta conta admite o cifrado de extremo a extremo</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>Ao retirar o cifrado de extremo a extremo, retiraranse os ficheiros sincronizados localmente que est?n cifrados.<br>Os ficheiros cifrados permanecer?n no servidor.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Definir o cifrado</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) de %2 en uso. Alg?ns cartafoles, inclu?ndo os compartidos e os montados en rede, poder?an ter diferentes l?mites.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 de %2 en uso</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Actualmente non hai dispo??bel ningunha informaci?n sobre o uso do almacenamento.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 como %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>Este servidor da versi?n %1 non ten asistencia t?cnica! Proceda baixo a s?a propia responsabilidade.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>O servidor % 1 est? a ser redirixido ou a s?a conexi?n est? detr?s dun portal cativo.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Conectando con %1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>Non ? pos?bel conectar con %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Produciuse un erro de configuraci?n do servidor: %1 en %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>? preciso que Vde. acepte as condici?ns de servizo en %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Non se configurou a conexi?n %1.</translation>
</message>
</context>
<context>
@@ -1125,11 +1163,6 @@
<translation>Certificado e chave (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Examinar?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Contrasinal do certificado:</translation>
@@ -1140,6 +1173,11 @@
<translation>Recom?ndase encarecidamente un paquete pkcs12 cifrado xa que se gardar? unha copia no ficheiro de configuraci?n.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Examinar?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Seleccione un certificado</translation>
@@ -1190,34 +1228,34 @@
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 contas</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 conta</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 cartafoles</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 cartafol</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Importar estilo antigo</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1225,12 +1263,12 @@
% 3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Produciuse un erro ao acceder ao ficheiro de configuraci?n</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>Produciuse un erro ao acceder ao ficheiro de configuraci?n en %1. Comprobe que ? pos?bel acceder ao ficheiro coa s?a conta do sistema.</translation>
</message>
@@ -1272,6 +1310,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1279,6 +1356,11 @@
<translation>Non foi pos?bel enviar o ficheiro %1 porque existe outro ficheiro co mesmo nome que s? se diferenzan polas mai?suclas</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>O ficheiro %1 ten unha data de modificaci?n incorrecta. Non o env?e ao servidor.</translation>
@@ -1483,7 +1565,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Produciuse un erro ao escribir os metadatos na base de datos</translation>
</message>
@@ -1613,21 +1695,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Confirma que quere eliminar definitivamente o directorio <i>%1</i> e todo o seu contido?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Confirma que quere eliminar definitivamente o ficheiro <i>%1</i> ?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Confirmar a eliminaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1643,30 +1710,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Non hai configurada ningunha conta Nextcloud </translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Confirma que quere eliminar definitivamente o directorio <i>%1</i> e todo o seu contido?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Produciuse un erro de autenticaci?n: Ou o nome de usuario ou o contrasinal son err?neos.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Confirma que quere eliminar definitivamente o ficheiro <i>%1</i> ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Confirmar a eliminaci?n</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Tempo de espera</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>As credenciais fornecidas non son correctas</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>O servidor configurado para este cliente ? moi antigo</translation>
@@ -1676,16 +1743,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Actualice ao ?ltimo servidor e reinicie o cliente.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Produciuse un erro de autenticaci?n: Ou o nome de usuario ou o contrasinal son err?neos.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Non hai configurada ningunha conta Nextcloud </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>As credenciais fornecidas non son correctas</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Produciuse un ficheiro ao cancelar a eliminaci?n dun ficheiro</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>Produciuse un ficheiro ao cancelar a eliminaci?n de %1</translation>
</message>
@@ -1693,19 +1775,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Erro do servidor: a resposta PROPFIND non est? formatada en XML.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>Produciuse un erro na configuraci?n dos metadatos cifrados!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>Produciuse un erro de configuraci?n dos metadatos cifrados: a sinatura inicial do servidor est? baleira.</translation>
</message>
@@ -1713,27 +1795,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Produciuse un erro ao abrir o directorio %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Directorio non acces?bel no cliente, permiso denegado</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Non se atopou o directorio: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>O nome de ficheiro codificado non ? correcto</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Produciuse un erro ao ler o directorio %1</translation>
</message>
@@ -1973,11 +2055,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>O URL solicitado non comeza con HTTPS a?nda que o URL de acceso indicado comeza por HTTPS. Non ? pos?bel acceder porque isto poder?a implicar un fallo de seguranza. Consulte coa administraci?n desta instancia.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>O URL do servidor devolto non comeza con HTTPS a pesar de que o URL de acceso comezou con HTTPS. Non ser? pos?bel acceder porque isto pode ser un problema de seguranza. P??ase en contacto coa administraci?n desta instancia.</translation>
@@ -1989,28 +2066,33 @@
<translation>Erro devolto desde o servidor: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>O URL solicitado non comeza con HTTPS a?nda que o URL de acceso indicado comeza por HTTPS. Non ? pos?bel acceder porque isto poder?a implicar un fallo de seguranza. Consulte coa administraci?n desta instancia.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Produciuse un erro ao acceder ao ?testemu?o? do punto final: <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Non foi pos?bel analizar o JSON devolto desde o servidor: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>A resposta do servidor non conti?a todos os campos agardados</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Non foi pos?bel analizar o JSON devolto desde o servidor: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2053,6 +2135,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>Retirouse %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>Enviouse %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 foi renomeado a %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 foi movido a %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>Escolla unha localizaci?n diferente. O cartafol %1 non existe.</translation>
@@ -2068,17 +2178,6 @@
<translation>Escolla unha localizaci?n diferente. O cartafol %1 non ? lex?bel.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 e outro ficheiro foi retirado.</numerusform><numerusform>%1 e outros %n ficheiros foron retirados.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>Retirouse %1.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 e outro ficheiro foi actualizado.</numerusform><numerusform>%1 e outros %n ficheiros foron engadidos.</numerusform></translation>
@@ -2094,33 +2193,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 e outro ficheiro foi actualizado.</numerusform><numerusform>%1 e outros %n ficheiros foron actualizados.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>Enviouse %1.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 foi renomeado a %2 e outro ficheiro tam?n foi renomeado.</numerusform><numerusform>%1 foi renomeado a %2 e outros %n ficheiros tam?n foron renomeados.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 foi renomeado a %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 foi movido a %2 e outro ficheiro tam?n foi movido.</numerusform><numerusform>%1 foi movido a %2 e outros %n ficheiros tam?n foron movidos.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 foi movido a %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2157,68 +2239,68 @@
<translation>Actividade de sincronizaci?n</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Non foi pos?bel ler o ficheiro de exclusi?n do sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Foi engadido un cartafol maior de %1 MB: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Foi engadido un cartafol de almacenamento externo
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Vaia a axustes para seleccionalo se quere descargar isto.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>Un cartafol superou o l?mite de tama?o de cartafol establecido de %1MB: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>Manter sincronizado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>Deixar de sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>O cartafol %1 superou o l?mite de tama?o de cartafol estabelecido de %2MB.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>Quere deixar de sincronizar este cartafol?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Creouse o cartafol %1 mais foi exclu?do da sincronizaci?n con anterioridade. Os datos no seu interior non se sincronizar?n.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Creouse o ficheiro %1 mais foi exclu?do da sincronizaci?n con anterioridade. Non se sincronizar?.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2231,12 +2313,12 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>Produciuse un fallo na descarga do ficheiro virtual co c?digo ?%1?, o estado ?%2? e a mensaxe de erro ?%3?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2245,7 +2327,7 @@
Como alternativa, pode restaurar todos os ficheiros eliminados envi?ndoos desde o cartafol ?%1? ao servidor.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2254,22 +2336,22 @@
Como alternativa, pode restaurar todos os ficheiros eliminados descarg?ndoos do servidor.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>Quere retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>Proceder ? eliminaci?n</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>Restaurar os ficheiros no servidor</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>Restaurar os ficheiros do servidor</translation>
</message>
@@ -2310,11 +2392,6 @@
<translation>Non foi pos?bel restabelecer o estado do cartafol</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>Atopouse un diario de sincronizaci?n antigo ?%1?, mais non foi pos?bel retiralo. Aseg?rese de que ningunha aplicaci?n estea a usalo actualmente.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation> (copia de seguranza)</translation>
@@ -2325,6 +2402,11 @@
<translation> (copia de seguranza %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>Atopouse un diario de sincronizaci?n antigo ?%1?, mais non foi pos?bel retiralo. Aseg?rese de que ningunha aplicaci?n estea a usalo actualmente.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Estado sen definir.</translation>
@@ -2395,16 +2477,6 @@
<translation>Cancelouse a solicitude de sincronizaci?n.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Sincronizaci?n en pausa.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (sincronizaci?n en pausa)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>Escolla unha localizaci?n diferente. O cartafol seleccionado non ? v?lido.</translation>
@@ -2454,6 +2526,16 @@
Para resolver este problema: retire %1 dunha das contas e cree un novo cartafol de sincronizaci?n.
Para usuarios avanzados: este problema pode estar relacionado con varios ficheiros de bases de datos de sincronizaci?n que se atopan nun cartafol. Comprobe se %1 ten ficheiros .sync_*.db obsoletos e sen usar e ret?reos.</translation>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Sincronizaci?n en pausa.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (sincronizaci?n en pausa)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2497,16 +2579,6 @@
<translation>Produciuse un erro ao cargar a lista de cartafoles desde o servidor.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Recuperando a lista de cartafoles do servidor?</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Hai conflitos sen resolver. Prema para obter m?is detalles.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>Est? activada a compatibilidade con ficheiros virtuais.</translation>
@@ -2548,16 +2620,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>Descargar %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>Ficheiro %1 de %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Hai conflitos sen resolver. Prema para obter m?is detalles.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>Descargar %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Recuperando a lista de cartafoles do servidor?</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2604,21 +2691,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 de %2, ficheiro %3 de %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>Ficheiro %1 de %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>Agardando por outro cartafol?</numerusform><numerusform>Agardando por outros %n cartafoles?</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>A piques de comezar a sincronizaci?n</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>Agardando por outro cartafol?</numerusform><numerusform>Agardando por outros %n cartafoles?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2778,11 +2860,6 @@
<translation>Axustes xerais</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Executar ao iniciar o sistema</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>Amosar as notificaci?ns de chamadas</translation>
@@ -2793,11 +2870,6 @@
<translation>Para a ?rea de notificaci?n</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Usar iconas &monocrom?ticas</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>Amosar as notificaci?ns de parolas</translation>
@@ -2813,17 +2885,32 @@
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Preguntar se se queren sincronizar novos cartafoles de m?is de</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Preguntar se se queren sincronizar os cartafoles de almacenamento externo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Executar ao iniciar o sistema</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Usar iconas &monocrom?ticas</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Preguntar se se queren sincronizar novos cartafoles de m?is de</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>Notificar cando os cartafoles sincronizados superen o l?mite especificado</translation>
@@ -2834,11 +2921,6 @@
<translation>Desactivar automaticamente a sincronizaci?n de cartafoles que superan o l?mite</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Preguntar se se queren sincronizar os cartafoles de almacenamento externo</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>Mover os ficheiros retirados ao lixo</translation>
@@ -2890,11 +2972,6 @@
<translation>Actualizar a canle</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Reiniciar e actualizar</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>Comprobar &automaticamente as actualizaci?ns</translation>
@@ -2915,6 +2992,16 @@
<translation>Aviso legal</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Reiniciar e actualizar</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Notificaci?ns do servidor que precisan atenci?n.</translation>
@@ -2935,6 +3022,11 @@
<translation>Non pode desactivar o inicio autom?tico porque o inicio autom?tico de todo o sistema est? activado.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>est?bel</translation>
@@ -3015,6 +3107,11 @@
<source>Debug archive is created at %1</source>
<translation>O arquivo de depuraci?n creouse en %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3179,102 +3276,97 @@
<translation>Novo nome de ficheiro</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Cambiar o nome do ficheiro</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>Non foi pos?bel sincronizar o ficheiro ?%1? porque o nome cont?n caracteres que non est?n permitidos neste sistema.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>Os seguintes caracteres non est?n permitidos no sistema: * " | & ? , ; : \ / ~ < > espazos ao principio/ao final</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>Non foi pos?bel sincronizar o ficheiro ?%1? porque o nome cont?n caracteres que non est?n permitidos neste servidor.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>Non se permiten os seguintes caracteres: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>Non se permiten os seguintes nomes base: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>Non se permiten os seguintes nomes de ficheiro: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>Non se permiten as seguintes extensi?ns de ficheiro: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Comprobando os permisos de cambio de nome?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>Non ten permiso para cambiar o nome deste ficheiro. P?dalle ao autor do ficheiro que o cambie.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>Produciuse un fallo ao recuperar os permisos co erro %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>O nome do ficheiro cont?n espazos ao principio e ao final.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>O nome do ficheiro cont?n espazos ao principio.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>O nome do ficheiro cont?n espazos ao final.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>Nome incorrecto</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>O nome do ficheiro cont?n caracteres non admitidos: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>Non foi pos?bel cambiar o nome do ficheiro. Aseg?rese de estar conectado ao servidor.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>Non ? pos?bel cambiar o nome do ficheiro porque xa existe un ficheiro co mesmo nome no servidor. Escolla outro nome.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>Non foi pos?bel cambiar o nome do ficheiro local. %1</translation>
</message>
@@ -3398,16 +3490,6 @@
<translation><p>Hai dispo??bel unha nova versi?n do cliente %1.</p><p>Pode descargar a versi?n <b>%2</b>. A versi?n instalada ? a %3</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Omitir polo de agora</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Obter a actualizaci?n</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>Produciuse un fallo ao actualizar</translation>
@@ -3432,6 +3514,16 @@
<source>Update manually</source>
<translation>Actualizar manualmente</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Omitir polo de agora</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Obter a actualizaci?n</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3456,6 +3548,23 @@
<translation>O servidor proxy precisa autenticaci?n</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Largo de banda de descarga</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Limitar a</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>Nota: Os axustes do proxy non te?en efectos para as contas en localhost</translation>
@@ -3478,46 +3587,29 @@
<translation>Usar os axustes globais</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Largo de banda de descarga</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Sen l?mite</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Limitar a</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Limitar a 3/4 do largo de banda estimado</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Largo de banda de env?os</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Limitar autom?ticamente</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Largo de banda de env?os</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Nome de m?quina para o servidor proxy</translation>
@@ -3546,6 +3638,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>Non foi pos?bel comprobar se hai novas actualizaci?ns.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Comprobando o servidor de actualizaci?ns?</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>Preparada a nova actualizaci?n %1</translation>
@@ -3576,11 +3678,6 @@
<translation>Non foi pos?bel descargar a actualizaci?n. Abra %1 para descargar a actualizaci?n manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>Non foi pos?bel comprobar se hai novas actualizaci?ns.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>Xa est? dispo??bel o novo %1. Abra <a href='%2'>%2</a> para descargar a actualizaci?n.</translation>
@@ -3591,16 +3688,21 @@
<translation>Xa est? dispo??bel o novo %1. Abra %2 para descargar a actualizaci?n.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Comprobando o servidor de actualizaci?ns?</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>O estado da actualizaci?n ? desco?ecido: non se comprobaron as actualizaci?ns.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Non hai actualizaci?ns dispo??beis. A instalaci?n xa est? na versi?n m?is recente.</translation>
@@ -3776,11 +3878,6 @@
<translation><font color="green">Conectouse correctamente a %1: %2 versi?n %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>URL incorrecto</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Non foi pos?bel conectar con %1 en %2:<br/>%3</translation>
@@ -3791,6 +3888,16 @@
<translation>Esgotouse o tempo tentando conectar con %1 en %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Acceso prohibido polo servidor. Para comprobar que disp?n do acceso axeitado, <a href="%1">prema aqu?</a> para acceder ao servizo co seu navegador.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>URL incorrecto</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Tentando conectar con %1 en %2?</translation>
@@ -3801,11 +3908,6 @@
<translation>A solicitude autenticada ao servidor foi redirixida a ?%1?. O URL ? incorrecto, o servidor est? mal configurado.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Acceso prohibido polo servidor. Para comprobar que disp?n do acceso axeitado, <a href="%1">prema aqu?</a> para acceder ao servizo co seu navegador.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>Deuse unha resposta incorrecta a unha solicitude de WebDAV autenticada</translation>
@@ -4017,62 +4119,34 @@
<translation>Os nomes de ficheiros que finalizan cun punto non est?n admitidos neste sistema de ficheiros.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Cartafol</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Ficheiro</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>O nome %1 que cont?n o car?cter ?%2? non est? admitido neste sistema de ficheiros.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>O nome %1 cont?n alg?n car?cter incorrecto</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>O nome %1 ? un nome reservado neste sistema de ficheiros.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>O nome de ficheiro cont?n alg?n car?cter incorrecto</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4082,6 +4156,24 @@
<translation>O nome do ficheiro cont?n espazos finais.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Cartafol</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Ficheiro</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>O nome %1 que cont?n o car?cter ?%2? non est? admitido neste sistema de ficheiros.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4090,6 +4182,16 @@
<translation>Non foi pos?bel cambiar o nome ou enviar.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>O nome %1 cont?n alg?n car?cter incorrecto</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>O nome %1 ? un nome reservado neste sistema de ficheiros.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>O nome do ficheiro cont?n espazos ao principio.</translation>
@@ -4180,64 +4282,74 @@
<translation>O servidor non informou de %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Non ? pos?bel sincronizar por mor dunha hora de modificaci?n incorrecta</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>Non foi pos?bel enviar o ficheiro porque est? aberto en ?%1?.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>Produciuse un erro ao eliminar o rexistro do ficheiro %1 da base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>Moveuse a un destino non v?lido, restaur?ndo</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>Non ? pos?bel modificar o elemento cifrado porque o certificado seleccionado non ? v?lido.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorado por mor da lista de bloqueo de ?Escoller que sincronizar?</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Non se lle permite porque Vde. non ten permiso para engadir subcartafoles neste cartafol</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Non se lle permite porque Vde. non ten permiso para engadir ficheiros neste cartafol</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Non est? permitido o env?o xa que o ficheiro ? s? de lectura no servidor, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>Non est? permitido retiralo, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Produciuse un erro ao ler a base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>O servidor respondeu cun erro ao ler o directorio ?%1? : %2</translation>
</message>
@@ -4245,38 +4357,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>Non foi pos?bel eliminar o ficheiro %1 da BD local</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>Produciuse un erro ao actualizar os metadatos por mor dunha hora de modificaci?n incorrecta</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>Non ? pos?bel facer que o cartafol %1 sexa de s? lectura: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>excepci?n desco?ecida</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Produciuse un erro ao actualizar os metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>O ficheiro est? en uso</translation>
</message>
@@ -4294,12 +4406,6 @@
<translation>Non ? pos?bel descargar o ficheiro %1 xa que falta informaci?n do cifrado.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>O ficheiro cambiou ap?s ser achado</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4356,6 +4462,12 @@
<source>The file %1 is currently in use</source>
<translation>O ficheiro %1 est? en uso neste momento</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>O ficheiro cambiou ap?s ser achado</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4373,39 +4485,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>non foi pos?bel eliminar o ficheiro %1, erro: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>Non ? pos?bel crear o cartafol %1 por mor dunha colisi?n co nome dun ficheiro ou cartafol local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>Non foi pos?bel crear o cartafol %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>Non ? pos?bel facer que o cartafol %1 sexa de s? lectura: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>excepci?n desco?ecida</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Produciuse un erro ao actualizar os metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>O ficheiro %1 est? en uso neste momento</translation>
</message>
@@ -4418,14 +4530,14 @@
<translation>Non ? pos?bel retirar %1 por mor dunha colisi?n co nome dun ficheiro local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Non foi pos?bel eliminar o rexistro do ficheiro %1 da base de datos local</translation>
</message>
@@ -4433,49 +4545,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>Non ? pos?bel cambiarlle o nome ao cartafol %1 por mor dunha colisi?n co nome dun ficheiro ou cartafol local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>Descargouse o ficheiro %1 mais provocou unha colisi?n no nome do ficheiro local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>Non foi pos?bel obter o ficheiro %1 da BD local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Produciuse un erro ao definir o estado do pin</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Produciuse un erro ao actualizar os metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>O ficheiro %1 est? en uso neste momento</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>Produciuse un erro ao propagar o cambio de nome do directorio na xerarqu?a</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Produciuse un fallo ao cambiarlle o nome ao ficheiro</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Non foi pos?bel eliminar o rexistro do ficheiro %1 da base de datos local</translation>
</message>
@@ -4532,39 +4644,39 @@
<translation>Non foi pos?bel cambiarlle o nome de %1 a %2, erro: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Produciuse un erro ao actualizar os metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>O ficheiro %1 est? en uso neste momento</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>O servidor devolveu c?digo HTTP err?neo. Agard?base 201, mais recibiuse ?%1 %2?.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>Non foi pos?bel obter o ficheiro %1 da BD local</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Non foi pos?bel eliminar o rexistro do ficheiro %1 da base de datos local</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Produciuse un erro ao definir o estado do pin</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Produciuse un erro ao escribir os metadatos na base de datos</translation>
</message>
@@ -4572,22 +4684,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>Produciuse un erro ao enviar un ficheiro cifrado.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>Non foi pos?bel enviar o ficheiro %1 xa que existe outro co mesmo nome. Difire s? nas maiusculas/min?sculas</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>O env?o de %1 excede o l?mite de tama?o do cartafol</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4595,11 +4696,6 @@
<translation>O ficheiro %1 ten unha hora de modificaci?n incorrecta. Non o env?e ao servidor.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Ficheiro retirado (iniciar o env?o) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>O ficheiro local cambiou durante a sincronizaci?n. Retomase.</translation>
@@ -4629,6 +4725,22 @@
<source>The file %1 is currently in use</source>
<translation>O ficheiro %1 est? en uso neste momento</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>O env?o de %1 excede o l?mite de tama?o do cartafol</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>Produciuse un erro ao enviar un ficheiro cifrado.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Ficheiro retirado (iniciar o env?o) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4877,6 +4989,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Compartir o men? contextual</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Compart?n algo con Vde.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Opci?ns de compartir</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Enviar a ligaz?n privada por correo?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Copiar a ligaz?n privada no portapapeis</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>Produciuse un fallo ao cifrar o cartafol en ?%1?</translation>
@@ -4911,43 +5049,17 @@
<translation>O seguinte cartafol foi cifrado correctamente: ?%1?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Compartir o men? contextual</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Seleccionar a nova localizaci?n?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Compart?n algo con Vde.</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Opci?ns de compartir</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Actividade</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Copiar a ligaz?n privada no portapapeis</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Enviar a ligaz?n privada por correo?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>Deixar esta compartici?n</translation>
@@ -4963,11 +5075,6 @@
<translation>Non est? permitido volver compartir este cartafol</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Copiar a ligaz?n interna</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>Cifrar</translation>
@@ -4994,12 +5101,6 @@
<translation><numerusform>Caduca en %1 minutos</numerusform><numerusform>Caduca en %1 minutos</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Abrir no navegador</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Resolver conflitos?</translation>
@@ -5029,6 +5130,17 @@
<source>Delete</source>
<translation>Eliminar</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Copiar a ligaz?n interna</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Abrir no navegador</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5130,13 +5242,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Esta conexi?n non ? segura e non est? cifrada.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Versi?n do servidor: %1</translation>
@@ -5156,6 +5261,13 @@
<source>The connection is not secure</source>
<translation>A conexi?n non ? segura</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Esta conexi?n non ? segura e non est? cifrada.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5248,6 +5360,32 @@
<translation>%1 (omitido por mor do erro anterior, tent?ndoo de novo en %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>S? %1 est? dispo??bel, necesita polo menos %2 para comezar</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>Non ? pos?bel abrir ou crear a base de datos de sincronizaci?n local. Aseg?rese de ter acceso de escritura no cartafol de sincronizaci?n.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Pouco espazo dispo??bel no disco: As descargas que reduzan o tama?o por baixo de %1 van ser omitidas.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>Non hai espazo libre abondo no servisor para alg?ns env?os.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Conflito sen resolver.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>Non foi pos?bel actualizar o ficheiro: %1</translation>
@@ -5268,22 +5406,6 @@
<translation>Non foi pos?bel definir o rexistro do ficheiro na base de datos local: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Conflito sen resolver.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>S? %1 est? dispo??bel, necesita polo menos %2 para comezar</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>Non ? pos?bel abrir ou crear a base de datos de sincronizaci?n local. Aseg?rese de ter acceso de escritura no cartafol de sincronizaci?n.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Usando ficheiros virtuais con sufixo, mais o sufixo non est? estabelecido</translation>
@@ -5303,16 +5425,6 @@
<source>Cannot open the sync journal</source>
<translation>Non foi pos?bel abrir o diario de sincronizaci?n</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Pouco espazo dispo??bel no disco: As descargas que reduzan o tama?o por baixo de %1 van ser omitidas.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>Non hai espazo libre abondo no servisor para alg?ns env?os.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5323,7 +5435,7 @@
<translation>Sen conexi?n</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>? preciso que Vde. acepte as condici?ns de servizo</translation>
</message>
@@ -5707,11 +5819,6 @@
<source>Less than a minute</source>
<translation>Menos dun minuto</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5719,20 +5826,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1 minuto</numerusform><numerusform>%1 minutos</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1 hora</numerusform><numerusform>%1 horas</numerusform></translation>
@@ -5747,6 +5844,21 @@
<source>%1 days</source>
<translation><numerusform>%1 d?a</numerusform><numerusform>%1 d?as</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5889,6 +6001,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Ten que acceder</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>Non existen cartafoles de sincronizaci?n configurados.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Desconectado de %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Versi?n del servidor non admitida</translation>
@@ -5909,31 +6036,6 @@
<translation>A s?a conta %1 require que acepte as condici?ns de servizo do seu servidor. Vai ser redirixido a %2 para que confirme que as leu e que est? conforme con elas.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Desconectado de %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Desconectado das contas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Conta %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Ten que acceder</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>A sincronizaci?n est? desactivada</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5955,11 +6057,6 @@
<translation>macOS VFS para %1: atopouse un problema.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>Non existen cartafoles de sincronizaci?n configurados.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Comprobando os cambios no ?%1? remoto</translation>
@@ -5970,6 +6067,21 @@
<translation>Comprobando os cambios no cartafol local ?%1?</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Desconectado das contas:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Conta %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>A sincronizaci?n est? desactivada</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5978,11 +6090,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>Cartafol &local</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Nome de usuario</translation>
@@ -6018,22 +6125,11 @@
<translation>Preguntar antes de sincronizar cartafoles de m?is de</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Preguntar antes de sincronizar almacenamentos externos</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Escoller que sincronizar</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Conservar os datos locais</translation>
@@ -6048,6 +6144,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Eliminar o cartafol local e iniciar unha sincronizaci?n limpa</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Escoller que sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>Cartafol &local</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6088,6 +6200,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>no futuro</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1m</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>agora</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Hai alg?n tempo</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6128,57 +6285,12 @@
<source>Synced %1</source>
<translation>Sincronizou %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>no futuro</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>agora</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1m</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Hai alg?n tempo</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>As rutas que comezan co car?cter ?#? non est?n admitidas no modo VFS.</translation>
@@ -6424,6 +6536,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>Abrir cartafoles locais ou de grupo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Abrir o cartafol local</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Conectado</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>Desconectado</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>Abrir o cartafol local ?%1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>Abrir o cartafol do grupo ?%1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>Abrir % 1 no xestor de ficheiros</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>Men? de grupos de usuarios e cartafoles locais</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6613,16 +6768,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6637,6 +6782,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6870,16 +7025,16 @@
<translation>Produciuse un erro durante a configuraci?n</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Preparando para sincronizar</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>Deter a sincronizaci?n</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Preparando para sincronizar</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Sincronizaci?n en pausa</translation>
@@ -6938,4 +7093,17 @@
<translation>Liberar espazo local</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>Activar a sincronizaci?n r?pida</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>A sincronizaci?n r?pida s? sincronizar? os cambios nos ficheiros e cartafoles dos cartafoles que se examinaron. Isto pode aumentar significativamente a capacidade de resposta na configuraci?n inicial dos ficheiros virtuais. Por?n, provocar? descargas redundantes de ficheiros movidos a un cartafol non examinado.</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_he.ts nextcloud-desktop-3.16.6/translations/client_he.ts
--- nextcloud-desktop-3.16.4/translations/client_he.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_he.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
@@ -570,7 +562,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>??? ?????:?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>?????? ?? ??????? <b> ????? </b> ?????? ?????? ??????? ??? ??? ???????? ????? ?? ????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>?????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>????? ??????? <server> ? <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>?????? ????</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>??? ?????:?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>????? ??????? <server> ? <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>?? ????? ?????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation type="unfinished"/>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>?? ????? ?????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation type="unfinished"/>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -731,12 +739,6 @@
<translation>?? ???? ?????? ?? ??????? ????? ???????? ?? ????? ???</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>????? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>????</translation>
@@ -775,16 +777,6 @@
<translation>?????? ?? ??????? ????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>?????? ???????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>?????? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>???? ????? ?????? ???????</translation>
@@ -810,21 +802,11 @@
<translation>????? ??????? ?????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>?? ???? ????? ?????? ?????? <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>??? ???? ????? ? ?????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>??? ?????? ?????? ?? ?????? ?????? <i>%1</i>?</p><p><b>??? ??:</b> ????? ?? <b>?? </b> ???? ?? ??????.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>??? ????? ? ?????? ??????</translation>
@@ -854,23 +836,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -884,36 +866,46 @@
<translation>??????? ?????.<br/>??? ?????? ?? ?????? ?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) ???? %2 ??????. ??? ????????, ?????? ?????? ??? ?? ???????, ?????? ????? ????? ????? ?????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 ??????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 ???? %2 ??????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>???? ?? ??? ?? ???? ???? ?? ?????? ??????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 ??????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>????? ?? ???? ?????? ???? ????</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
<source>Connected to %1.</source>
<translation>???? ????? ?? %1.</translation>
@@ -929,80 +921,126 @@
<translation>???? %1 ???? ???? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>???? ??????? %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>?????? ??????? ?? %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>???? ?????? ??? ??????? ???? ????? ???:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>???? ?????? ??? ??????? ????? ??? ?????? ?? ????? ????? ????????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>????? ?????? ????: %1 ??%2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>???? ?????? ??? ??????? ????? ??? ?????? ??? ?? ?????? ??????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>?????? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>?????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>?? ???? ????? ?????? ?????? <i>%1</i>.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>??? ?????? ?????? ?? ?????? ?????? <i>%1</i>?</p><p><b>??? ??:</b> ????? ?? <b>?? </b> ???? ?? ??????.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>??? ????? ?????? %1</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>???? ?????? ??? ??????? ???? ????? ???:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>???? ?????? ??? ??????? ????? ??? ?????? ?? ????? ????? ????????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) ???? %2 ??????. ??? ????????, ?????? ?????? ??? ?? ???????, ?????? ????? ????? ????? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>???? ?????? ??? ??????? ????? ??? ?????? ??? ?? ?????? ??????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 ???? %2 ??????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>???? ?? ??? ?? ???? ???? ?? ?????? ??????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>????? ?? ???? ?????? ???? ????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>?????? ??????? ?? %1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>????? ?????? ????: %1 ??%2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>??? ????? ?????? %1</translation>
+ </message>
</context>
<context>
<name>OCC::AccountSetupFromCommandLineJob</name>
@@ -1116,11 +1154,6 @@
<translation>????? ????? (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>?????</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>???? ??????:</translation>
@@ -1131,6 +1164,11 @@
<translation>???? pkcs12 ????? ????? ???? ????? ?????? ???? ????? ???????.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>?????</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>?? ????? ??????</translation>
@@ -1181,46 +1219,46 @@
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>????? ????? ????? ????? ???????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation type="unfinished"/>
</message>
@@ -1262,6 +1300,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1269,6 +1346,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
@@ -1473,7 +1555,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>????? ????? ??? ????? metadata ? ??? ???????</translation>
</message>
@@ -1603,21 +1685,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1633,30 +1700,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>?? ????? ????? Nextcloud</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>????? ????: ?? ?????? ?? ????? ???? ??????.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>????? ?????</translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
+ <message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>???? ?????? ???? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>???? ?????? ????? ?? ????? ???</translation>
@@ -1666,16 +1733,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>?? ????? ????? ????? ????? ?? ???? ??????? ???? ?? ?????.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>????? ????: ?? ?????? ?? ????? ???? ??????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>?? ????? ????? Nextcloud</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>???? ?????? ???? ??????</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation type="unfinished"/>
</message>
@@ -1683,19 +1765,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1703,27 +1785,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>?????? ?? ?????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>????? ?? ????? ?? ????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>????? ?????? ??????? %1</translation>
</message>
@@ -1962,11 +2044,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
@@ -1978,28 +2055,33 @@
<translation>???? ????? ?????: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>?? ???? ????? ?? ??JSON ?????? ?????: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>?????? ????? ?? ????? ?? ?? ????? ???????</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>?? ???? ????? ?? ??JSON ?????? ?????: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2042,6 +2124,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ??????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>??? ?? %1 ????? ??? %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 ?????? ?? %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2057,17 +2167,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 ????? %n ???? ????.</numerusform><numerusform>%1 ??%n ????? ?????? ?????.</numerusform><numerusform>%1 ??%n ????? ?????? ?????.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ?????.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -2083,33 +2182,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 ????? %n ???? ??????.</numerusform><numerusform>%1 ??%n ????? ?????? ??????.</numerusform><numerusform>%1 ??%n ????? ?????? ??????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ??????.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>??? ?? %1 ????? ??? %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 ?????? ?? %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2146,67 +2228,67 @@
<translation>?????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>?? ???? ????? ?? ???? ?????? ?? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>????? ?????? ?????? ??? ???? ??%1 ???: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>????? ?????? ????? ??????.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>?? ???? ??????? ??? ????? ?? ?????? ?????? ????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>??????? %1 ????? ?? ?????? ???????? ????. ??????? ?????? ?? ????????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>????? %1 ???? ?? ????? ???????? ????. ??? ?? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2215,41 +2297,41 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2290,11 +2372,6 @@
<translation>?? ???? ???? ?? ??? ???????</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(?????)</translation>
@@ -2305,6 +2382,11 @@
<translation>(????? %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation type="unfinished"/>
@@ -2375,16 +2457,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>??????? ?????.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (??????? ?????)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2431,6 +2503,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>??????? ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (??????? ?????)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2474,16 +2556,6 @@
<translation>????? ??? ????? ????? ??????? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>????? ??????? ?????? ??????</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>?? ?????? ??? ?????. ?? ????? ????? ?????.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>?????? ????? ?????? ??????????.</translation>
@@ -2525,16 +2597,31 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>?? ?????? ??? ?????. ?? ????? ????? ?????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation type="unfinished"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>????? ??????? ?????? ??????</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2581,21 +2668,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 ???? %2, ???? %3 ???? %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>?????? ??????? ??????</numerusform><numerusform>?????? ??%n ?????? ???????</numerusform><numerusform>?????? ??%n ?????? ???????</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>?????? ??????? ??????</numerusform><numerusform>?????? ??%n ?????? ???????</numerusform><numerusform>?????? ??%n ?????? ???????</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2755,11 +2837,6 @@
<translation>?????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>????? ?&????? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation type="unfinished"/>
@@ -2770,11 +2847,6 @@
<translation>???? ??????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>?????? ?????? ???? &????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2790,17 +2862,32 @@
<translation>?????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>???</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>???? ????? ???? ?????? ?????? ????? ????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>????? ?&????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>?????? ?????? ???? &????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2811,11 +2898,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>???? ????? ???? ?????? ?????? ????? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2867,11 +2949,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>?&???? ???? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation type="unfinished"/>
@@ -2892,6 +2969,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>?&???? ???? ??????</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>?????? ??? ??????? ????? ??.</translation>
@@ -2912,6 +2999,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation type="unfinished"/>
@@ -2986,6 +3078,11 @@
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3148,102 +3245,97 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation type="unfinished"/>
</message>
@@ -3364,16 +3456,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>???? ????</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>???? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation type="unfinished"/>
@@ -3398,6 +3480,16 @@
<source>Update manually</source>
<translation>????? ?????</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>???? ????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>???? ?????</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3422,6 +3514,23 @@
<translation>???? ?????? ???? ?????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>???? ?? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>?????? ????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>???/??</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation type="unfinished"/>
@@ -3444,46 +3553,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>???? ?? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>??? ?????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>???/??</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>?????? ????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>?????? ?? 3/4 ????? ??? ???????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>???? ?? ??????</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>?????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>???? ?? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>?? ????? ?? ???? ??????</translation>
@@ -3512,6 +3604,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>?? ???? ????? ?? ?? ??????? ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>??? ???????? ?????</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation type="unfinished"/>
@@ -3542,11 +3644,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>?? ???? ????? ?? ?? ??????? ?????.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation type="unfinished"/>
@@ -3557,16 +3654,21 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>??? ???????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>??? ?????? ?? ????: ?? ????? ?? ?? ??????? ?????.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>??? ????? ????. ?????? ?? ??? ??????? ?????.</translation>
@@ -3742,11 +3844,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>???????? ?? %1 ??%2 ?????:<br/>%3</translation>
@@ -3757,6 +3854,16 @@
<translation>???? ?????? ???????? ?? %1 ??%2 ??.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>????? ????? ?? ??? ????. ??? ????? ??? ?? ???? ?????, ???? <a href="%1">????? ???</a> ??? ???? ?????? ?? ?????? ???.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>????? ?????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>????? ?????? ?????? ?? %1 ??%2?</translation>
@@ -3767,11 +3874,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>????? ????? ?? ??? ????. ??? ????? ??? ?? ???? ?????, ???? <a href="%1">????? ???</a> ??? ???? ?????? ?? ?????? ???.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>?????? ????? ??WebDAV ??????? ?????</translation>
@@ -3977,62 +4079,34 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4042,6 +4116,24 @@
<translation>?? ????? ???? ?????? ??????.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4050,6 +4142,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
@@ -4140,64 +4242,74 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation type="unfinished"/>
</message>
@@ -4205,38 +4317,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4254,12 +4366,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>????? ????? ??? ??????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4316,6 +4422,12 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>????? ????? ??? ??????</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4333,39 +4445,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>?? ???? ????? ?? ????? %1, ?????: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4378,14 +4490,14 @@
<translation>?? ???? ????? ?? %1 ??? ????? ?? ?? ???? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4393,49 +4505,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4492,39 +4604,39 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>????? ??? HTTP ???? ?? ??? ????. ???? ??? ????? 201 ??? ????? ?%1 %2?.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>????? ?????? ????? ?? ???? ???????</translation>
</message>
@@ -4532,22 +4644,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>?? ???? ?????? ?? ????? %1 ????? ????? ???? ????? ???, ????? ??? ?? ??????? ??????/?????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>?????? ?? %1 ????? ????? ???????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4555,11 +4656,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>????? ???? (????? ??????) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>????? ?????? ????? ????? ???????. ?????? ?????.</translation>
@@ -4589,6 +4685,22 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>?????? ?? %1 ????? ????? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>????? ???? (????? ??????) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4837,6 +4949,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>????? ?????? ????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>?????? ??? ????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>???????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>????? ????? ???? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>????? ????? ???? ???? ???????</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4869,43 +5007,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>????? ?????? ????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>?????? ??? ????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>???????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>????? ????? ???? ???? ???????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>????? ????? ???? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4921,11 +5033,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>????? ????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -4952,12 +5059,6 @@
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>????? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation type="unfinished"/>
@@ -4987,6 +5088,17 @@
<source>Delete</source>
<translation>?????</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>????? ????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>????? ??????</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5088,13 +5200,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>????? ?? ???? ?????? ????? ????? ?????.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>???? ???: %1</translation>
@@ -5114,6 +5219,13 @@
<source>The connection is not secure</source>
<translation>?????? ???? ??????</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>????? ?? ???? ?????? ????? ????? ?????.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5206,24 +5318,25 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="383"/>
- <source>Could not update file: %1</source>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="412"/>
- <source>Could not update virtual file metadata: %1</source>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="419"/>
- <source>Could not update file metadata: %1</source>
- <translation type="unfinished"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>??? ?? ???? ???? ?????: ?????? ??????? ?????? ?? ???? ????? ???? ??? ?? %1 ??????.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="433"/>
- <source>Could not set file record to local DB: %1</source>
- <translation type="unfinished"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>??? ????? ???? ?? ???? ???? ????????.</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="465"/>
@@ -5231,14 +5344,23 @@
<translation>????? ???? ?????.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <location filename="../src/libsync/syncengine.cpp" line="383"/>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="412"/>
+ <source>Could not update virtual file metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="419"/>
+ <source>Could not update file metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="433"/>
+ <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/>
</message>
<message>
@@ -5261,16 +5383,6 @@
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>??? ?? ???? ???? ?????: ?????? ??????? ?????? ?? ???? ????? ???? ??? ?? %1 ??????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>??? ????? ???? ?? ???? ???? ????????.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5281,7 +5393,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5665,11 +5777,6 @@
<source>Less than a minute</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5677,20 +5784,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5705,6 +5802,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5847,6 +5959,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>?? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>?? ??????? ?????? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>????? ??%1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>???? ???? ???? ?????</translation>
@@ -5867,31 +5994,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>????? ??%1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>????? ?????????:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>????? %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>?? ??????</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>?????? ?????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5913,11 +6015,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>?? ??????? ?????? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation type="unfinished"/>
@@ -5928,6 +6025,21 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>????? ?????????:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>????? %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>?????? ?????? ?????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5936,11 +6048,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&?????? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation type="unfinished"/>
@@ -5976,22 +6083,11 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>???</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>?? ????? ?? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation type="unfinished"/>
@@ -6006,6 +6102,22 @@
<source>Erase local folder and start a clean sync</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>?? ????? ?? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&?????? ??????</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6046,6 +6158,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>?????</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>?????</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>??? ?? ????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6086,57 +6243,12 @@
<source>Synced %1</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>?????</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>?????</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>??? ?? ????</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6382,6 +6494,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6571,16 +6726,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 ??</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 ???</translation>
@@ -6595,6 +6740,16 @@
<source>%L1 KB</source>
<translation>%L1 ???</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 ??</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6828,16 +6983,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>????? ???????</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>????? ???????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>??????? ?????</translation>
@@ -6896,4 +7051,17 @@
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_hr.ts nextcloud-desktop-3.16.6/translations/client_hr.ts
--- nextcloud-desktop-3.16.4/translations/client_hr.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_hr.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
@@ -570,7 +562,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Prostor za pohranu:...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Neozna?ene mape bit ?e <b>uklonjene</b> iz va?eg lokalnog datote?nog sustava i vi?e se ne?e sinkronizirati s ovim ra?unalom</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Odustani</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Potvrdi</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Povezan s <poslu?itelj> kao <korisnik></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Sinkroniziraj sve</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Potvrdi</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Prostor za pohranu:...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Odustani</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Povezan s <poslu?itelj> kao <korisnik></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Ra?un nije konfiguriran.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation type="unfinished"/>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Ra?un nije konfiguriran.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation>Prika?i mnemoni?ku oznaku</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation type="unfinished"/>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -731,12 +739,6 @@
<translation>Nije mogu?e ?ifrirati mapu jer mapa vi?e ne postoji</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Otvori mapu</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>?ifriraj</translation>
@@ -775,16 +777,6 @@
<translation>Ponovno pokreni sinkronizaciju</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Nastavi sinkronizaciju</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Pauziraj sinkronizaciju</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Uklonite poveznicu za sinkronizaciju mape</translation>
@@ -810,21 +802,11 @@
<translation>Neuspje?na izrada mape</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Nije mogu?e stvoriti lokalnu mapu <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Potvrdi uklanjanje poveznice za sinkronizaciju mape</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>?elite li zaista prekinuti sinkronizaciju mape <i>%1</i>?</p><p><b>Napomena:</b> time <b>ne?ete</b> izbrisati datoteke.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Uklonite poveznicu za sinkronizaciju mape</translation>
@@ -858,23 +840,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -888,34 +870,44 @@
<translation>Sinkronizacija je pokrenuta.<br/>?elite li je prekinuti?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) od %2 u upotrebi. Neke mape, uklju?uju?i mre?ne ili dijeljene mape, mogu imati razli?ita ograni?enja.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 u upotrebi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 od %2 u upotrebi</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Trenutno nema dostupnih podataka o uporabi pohrane.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 u upotrebi</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 kao %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>Ina?ica poslu?itelja %1 nije podr?ana! Nastavite na vlastitu odgovornost.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Ovaj ra?un podr?ava cjelovito ?ifriranje</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -933,80 +925,126 @@
<translation>Poslu?itelj %1 trenutno je u na?inu odr?avanja.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Odjavili ste se iz %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Povezivanje s %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Ove mape nisu sinkronizirane jer su prevelike:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Ove mape nisu sinkronizirane jer su vanjski prostori za pohranu: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Pogre?ka konfiguracije poslu?itelja: %1 na %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Ove mape nisu sinkronizirane jer su prevelike ili su vanjski prostori za pohranu: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Otvori mapu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Nastavi sinkronizaciju</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Pauziraj sinkronizaciju</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Nije mogu?e stvoriti lokalnu mapu <i>%1</i>.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>?elite li zaista prekinuti sinkronizaciju mape <i>%1</i>?</p><p><b>Napomena:</b> time <b>ne?ete</b> izbrisati datoteke.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Nije konfigurirana veza %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Ove mape nisu sinkronizirane jer su prevelike:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Ove mape nisu sinkronizirane jer su vanjski prostori za pohranu: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) od %2 u upotrebi. Neke mape, uklju?uju?i mre?ne ili dijeljene mape, mogu imati razli?ita ograni?enja.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Ove mape nisu sinkronizirane jer su prevelike ili su vanjski prostori za pohranu: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 od %2 u upotrebi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Trenutno nema dostupnih podataka o uporabi pohrane.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 kao %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>Ina?ica poslu?itelja %1 nije podr?ana! Nastavite na vlastitu odgovornost.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Povezivanje s %1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Ovaj ra?un podr?ava cjelovito ?ifriranje</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Pogre?ka konfiguracije poslu?itelja: %1 na %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Nije konfigurirana veza %1.</translation>
+ </message>
</context>
<context>
<name>OCC::AccountSetupFromCommandLineJob</name>
@@ -1120,11 +1158,6 @@
<translation>Vjerodajnica i klju? (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Pretra?i...</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Zaporka vjerodajnice:</translation>
@@ -1135,6 +1168,11 @@
<translation>Preporu?uje se uporaba ?ifriranog paketa pkcs12 jer se kopija pohranjuje u konfiguracijskoj datoteci.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Pretra?i...</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Odaberi vjerodajnicu</translation>
@@ -1185,46 +1223,46 @@
<translation>Nastavi</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Pogre?ka pri pristupanju konfiguracijskoj datoteci</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation type="unfinished"/>
</message>
@@ -1266,6 +1304,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1273,6 +1350,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
@@ -1477,7 +1559,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Pogre?ka pri pisanju metapodataka u bazu podataka</translation>
</message>
@@ -1607,21 +1689,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>?elite li trajno izbrisati direktorij <i>%1</i> i sav njegov sadr?aj?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>?elite li trajno izbrisati datoteku <i>%1</i>?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Potvrdi brisanje</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1637,30 +1704,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Nema konfiguriranih Nexcloudovih ra?una</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>?elite li trajno izbrisati direktorij <i>%1</i> i sav njegov sadr?aj?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Pogre?na autentifikacija: pogre?no korisni?ko ime ili zaporka.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>?elite li trajno izbrisati datoteku <i>%1</i>?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Potvrdi brisanje</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Istek vremena</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Navedene vjerodajnice nisu to?ne</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>Konfigurirani poslu?itelj za ovog klijenta je prestar</translation>
@@ -1670,16 +1737,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>A?urirajte na najnoviji poslu?itelj i ponovno pokrenite klijenta.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Pogre?na autentifikacija: pogre?no korisni?ko ime ili zaporka.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Nema konfiguriranih Nexcloudovih ra?una</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Navedene vjerodajnice nisu to?ne</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation type="unfinished"/>
</message>
@@ -1687,19 +1769,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Pogre?ka poslu?itelja: PROPFIND odgovor nije formatiran u XML-u!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1707,27 +1789,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Pogre?ka pri otvaranju direktorija %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Direktorij nije raspolo?iv na klijentu, dopu?tenje je odbijeno</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Direktorij nije prona?en: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>Neva?e?e kodiranje naziva datoteke</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Pogre?ka pri ?itanju direktorija %1</translation>
</message>
@@ -1967,11 +2049,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>URL za dohva?anje podataka ne po?inje s HTTPS unato? tome ?to URL za prijavu po?inje s HTTPS. Prijavljivanje ?e biti onemogu?eno jer to predstavlja sigurnosni problem. Obratite se svom administratoru.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>URL vra?enog poslu?itelja ne po?inje s HTTPS unato? tome ?to URL za prijavu po?inje s HTTPS. Prijavljivanje ?e biti onemogu?eno jer to predstavlja sigurnosni problem. Obratite se svom administratoru.</translation>
@@ -1983,28 +2060,33 @@
<translation>Poslu?itelj je vratio pogre?ku: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>URL za dohva?anje podataka ne po?inje s HTTPS unato? tome ?to URL za prijavu po?inje s HTTPS. Prijavljivanje ?e biti onemogu?eno jer to predstavlja sigurnosni problem. Obratite se svom administratoru.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Do?lo je do pogre?ke prilikom pristupanja krajnjoj to?ki ?token?: <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Nije mogu?e parsirati JSON koji je vratio poslu?itelj: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>Odgovor poslu?itelja ne sadr?i sva o?ekivana polja</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Nije mogu?e parsirati JSON koji je vratio poslu?itelj: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2047,6 +2129,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 je uklonjena.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 je a?urirana.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 je preimenovana u %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 je premje?tena u %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2062,17 +2172,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 i %n drugih datoteka su uklonjene.</numerusform><numerusform>%1 i %n drugih datoteka su uklonjene.</numerusform><numerusform>%1 i %n drugih datoteka su uklonjene.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 je uklonjena.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 i %n druga datoteka su dodane.</numerusform><numerusform>%1 i %n druge datoteke su dodane.</numerusform><numerusform>%1 i %n drugih datoteka su dodane.</numerusform></translation>
@@ -2088,33 +2187,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 i %n drugih datoteka su a?urirane.</numerusform><numerusform>%1 i %n drugih datoteka su a?urirane.</numerusform><numerusform>%1 i %n drugih datoteka su a?urirane.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 je a?urirana.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 je preimenovana u %2 i %n drugih datoteka je preimenovano.</numerusform><numerusform>%1 je preimenovana u %2 i %n drugih datoteka je preimenovano.</numerusform><numerusform>%1 je preimenovana u %2 i %n drugih datoteka je preimenovano.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 je preimenovana u %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 je premje?tena u %2 i %n drugih datoteka je premje?teno.</numerusform><numerusform>%1 je premje?tena u %2 i %n drugih datoteka je premje?teno.</numerusform><numerusform>%1 je premje?tena u %2 i %n drugih datoteka je premje?teno.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 je premje?tena u %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2151,67 +2233,67 @@
<translation>Aktivnost sinkronizacije</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Nije mogu?e pro?itati datoteku izuzetka iz sustava</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Dodana je nova mapa ve?a od %1 MB: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Dodana je mapa iz vanjskog prostora za pohranu.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Idite u postavke kako biste je odabrali ako je ?elite preuzeti.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Mapa %1 je stvorena, ali je prethodno isklju?ena iz sinkronizacije. Podaci unutar nje ne?e se sinkronizirati.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Datoteka %1 je stvorena, ali je prethodno isklju?ena iz sinkronizacije. Ne?e se sinkronizirati.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2224,41 +2306,41 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2299,11 +2381,6 @@
<translation>Stanje mape nije mogu?e vratiti</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>Prona?en je stari sinkronizacijski dnevnik ?%1? ali ga nije mogu?e ukloniti. Provjerite koristi li ga trenutno neka druga aplikacija.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation> (sigurnosna kopija)</translation>
@@ -2314,6 +2391,11 @@
<translation> (sigurnosna kopija %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>Prona?en je stari sinkronizacijski dnevnik ?%1? ali ga nije mogu?e ukloniti. Provjerite koristi li ga trenutno neka druga aplikacija.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation type="unfinished"/>
@@ -2384,16 +2466,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Sinkronizacija je pauzirana.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (Sinkronizacija je pauzirana)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2440,6 +2512,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Sinkronizacija je pauzirana.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (Sinkronizacija je pauzirana)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2483,16 +2565,6 @@
<translation>Pogre?ka prilikom u?itavanja popisa mapa s poslu?itelja.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Dohva?anje popisa mapa s poslu?itelja?</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Postoje nerije?ena nepodudaranja. Kliknite za pojedinosti.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>Podr?ka za virtualne datoteke je omogu?ena.</translation>
@@ -2534,16 +2606,31 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Postoje nerije?ena nepodudaranja. Kliknite za pojedinosti.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation type="unfinished"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Dohva?anje popisa mapa s poslu?itelja?</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2590,21 +2677,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 od %2, datoteka %3 od %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>?eka se %n druga mapa?</numerusform><numerusform>?ekaju se %n druge mape?</numerusform><numerusform>?eka se %n drugih mapa?</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>?eka se %n druga mapa?</numerusform><numerusform>?ekaju se %n druge mape?</numerusform><numerusform>?eka se %n drugih mapa?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2764,11 +2846,6 @@
<translation>Op?e postavke</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>Pokreni pri pokretanju sustava</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation type="unfinished"/>
@@ -2779,11 +2856,6 @@
<translation>Za ladicu sustava</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Koristi jednobojne ikone</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2799,17 +2871,32 @@
<translation>Napredno</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Zatra?i potvrdu prije sinkronizacije vanjskih prostora za pohranu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>Pokreni pri pokretanju sustava</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Koristi jednobojne ikone</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2820,11 +2907,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Zatra?i potvrdu prije sinkronizacije vanjskih prostora za pohranu</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2876,11 +2958,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>Ponovno pokreni i a?uriraj</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation type="unfinished"/>
@@ -2901,6 +2978,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>Ponovno pokreni i a?uriraj</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Obavijesti poslu?itelja koje zahtijevaju pa?nju.</translation>
@@ -2921,6 +3008,11 @@
<translation>Ne mo?ete onemogu?iti automatsko pokretanje jer je omogu?eno automatsko pokretanje na razini cijelog sustava.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>stabilna</translation>
@@ -2995,6 +3087,11 @@
<source>Debug archive is created at %1</source>
<translation>Arhiva otklanjanja pogre?aka je stvorena na %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3159,102 +3256,97 @@
<translation>Novi naziv datoteke</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Preimenuj datoteku</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>Nemate dopu?tenje za preimenovanje ove datoteke. Zatra?ite autora datoteke da je preimenuje.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>Naziv datoteke sadr?i nedopu?tene znakove: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>Nije mogu?e preimenovati datoteku. Provjerite jeste li povezani s poslu?iteljem.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>Nije mogu?e preimenovati datoteku jer datoteka s istim nazivom ve? postoji na poslu?itelju. Odaberite neki drugi naziv.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation type="unfinished"/>
</message>
@@ -3378,16 +3470,6 @@
<translation><p>Dostupna je nova ina?ica klijenta %1.</p><p><b>%2</b> je dostupan za preuzimanje. Instalirana je ina?ica %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Presko?i ovaj put</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Dohvati a?uriranje</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>A?uriranje nije uspjelo</translation>
@@ -3412,6 +3494,16 @@
<source>Update manually</source>
<translation>A?uriraj ru?no</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Presko?i ovaj put</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Dohvati a?uriranje</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3436,6 +3528,23 @@
<translation>Proxy poslu?itelj zahtijeva autentifikaciju</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Propusnost za preuzimanja</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Ograni?i na</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KB/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>Napomena: postavke proxyja ne utje?u na ra?une na localhostu</translation>
@@ -3458,46 +3567,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Propusnost za preuzimanja</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Nema ograni?enja</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KB/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Ograni?i na</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Ograni?i na 3/4 procijenjene propusnosti</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Propusnost za otpremanja</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Ograni automatski</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Propusnost za otpremanja</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Naziv ra?unala proxy poslu?itelja</translation>
@@ -3526,6 +3618,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>Nije mogu?e provjeriti ima li novih a?uriranja.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Provjera poslu?itelja za a?uriranje?</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>Novo %1 a?uriranje je spremno</translation>
@@ -3556,11 +3658,6 @@
<translation>Nije mogu?e preuzeti a?uriranje. Otvorite %1 kako biste ru?no preuzeli a?uriranje.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>Nije mogu?e provjeriti ima li novih a?uriranja.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>Dostupan je novi %1. Otvorite <a href='%2'>%2</a> za preuzimanje a?uriranja.</translation>
@@ -3571,16 +3668,21 @@
<translation>Dostupan je novi %1. Otvorite %2 za preuzimanje a?uriranja.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Provjera poslu?itelja za a?uriranje?</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Status a?uriranja je nepoznat: provjera a?uriranja nije izvr?ena.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Nema dostupnih a?uriranja. Instalirana je najnovija ina?ica.</translation>
@@ -3756,11 +3858,6 @@
<translation><font color="green">Uspje?no povezivanje s %1: %2 ina?icom %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>Neispravan URL</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Neuspje?no povezivanje s %1 na %2:<br/>%3</translation>
@@ -3771,6 +3868,16 @@
<translation>Istek vremena tijekom povezivanja s %1 na %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Poslu?itelj je zabranio pristup. Kako biste provjerili imate li ispravan pristup, <a href="%1">kliknite ovdje</a> kako biste pristupili servisu putem preglednika.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>Neispravan URL</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Poku?aj povezivanja s %1 na %2?</translation>
@@ -3781,11 +3888,6 @@
<translation>Autorizirani zahtjev poslu?itelju preusmjeren je na ?%1?. URL je neispravan, poslu?itelj je pogre?no konfiguriran.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Poslu?itelj je zabranio pristup. Kako biste provjerili imate li ispravan pristup, <a href="%1">kliknite ovdje</a> kako biste pristupili servisu putem preglednika.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>Do?lo je do neva?e?eg odgovora na autorizirani zahtjev protokola WebDAV</translation>
@@ -3997,62 +4099,34 @@
<translation>Nazivi datoteka koji zavr?avaju to?kom nisu podr?ani u ovom datote?nom sustavu.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>Naziv datoteke sadr?i barem jedan neva?e?i znak</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4062,6 +4136,24 @@
<translation>Naziv datoteke sadr?i zavr?ne praznine.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4070,6 +4162,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
@@ -4160,64 +4262,74 @@
<translation>Poslu?itelj javlja da nema %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>Premje?teno na neva?e?e odredi?te, vra?anje</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Zanemareno zbog crne liste ?odaberi ?to ?e se sinkronizirati?</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Nije dopu?teno jer nemate dopu?tenje za dodavanje podmapa u tu mapu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Nije dopu?teno jer nemate dopu?tenje za dodavanje datoteka u tu mapu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Nije dopu?teno otpremiti ovu datoteku jer je dostupna samo za ?itanje na poslu?itelju, vra?anje</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>Nije dopu?teno uklanjanje, vra?anje</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Pogre?ka pri ?itanju baze podataka</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>Poslu?itelj je javio pogre?ku pri ?itanju direktorija ?%1? : %2</translation>
</message>
@@ -4225,38 +4337,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Pogre?ka pri a?uriranju metapodataka: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>Datoteka je trenutno u upotrebi</translation>
</message>
@@ -4274,12 +4386,6 @@
<translation>Datoteka %1 ne mo?e se preuzeti jer nedostaju informacije o ?ifriranju.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>Datoteka se promijenila od njenog otkri?a</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4336,6 +4442,12 @@
<source>The file %1 is currently in use</source>
<translation>Datoteka %1 je trenutno u upotrebi</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>Datoteka se promijenila od njenog otkri?a</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4353,39 +4465,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>nije mogu?e izbrisati datoteku %1, pogre?ka: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>Nije mogu?e stvoriti mapu %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Pogre?ka pri a?uriranju metapodataka: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>Datoteka %1 je trenutno u upotrebi</translation>
</message>
@@ -4398,14 +4510,14 @@
<translation>Nije mogu?e ukloniti %1 zbog nepodudaranja naziva lokalne datoteke</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4413,49 +4525,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Pogre?ka pri postavljanju stanja ?ifre</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Pogre?ka pri a?uriranju metapodataka: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>Datoteka %1 je trenutno u upotrebi</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Preimenovanje datoteke nije uspjelo</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4512,39 +4624,39 @@
<translation>Preimenovanje %1 u %2 nije uspjelo, pogre?ka: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Pogre?ka pri a?uriranju metapodataka: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>Datoteka %1 je trenutno u upotrebi</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Poslu?itelj je vratio pogre?nu HTTP ?ifru. O?ekivana je 201, ali je primljena ?%1 %2?.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Pogre?ka pri postavljanju stanja ?ifre</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Pogre?ka pri pisanju metapodataka u bazu podataka</translation>
</message>
@@ -4552,22 +4664,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>Otpremanje ?ifrirane datoteke nije uspjelo.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>Datoteka %1 ne mo?e se otpremiti jer postoji druga datoteka s istim nazivom koja se razlikuje samo po velikom/malom slovu</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>Otpremanje %1 prema?uje kvotu za mapu</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4575,11 +4676,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Datoteka je uklonjena (po?etak otpremanja) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Lokalna datoteka je izmijenjena tijekom sinkronizacije. Sinkroniziranje ?e se nastaviti.</translation>
@@ -4609,6 +4705,22 @@
<source>The file %1 is currently in use</source>
<translation>Datoteka %1 je trenutno u upotrebi</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>Otpremanje %1 prema?uje kvotu za mapu</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>Otpremanje ?ifrirane datoteke nije uspjelo.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Datoteka je uklonjena (po?etak otpremanja) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4857,6 +4969,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Dijeljenje kontekstnog izbornika</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Dijelim ne?to s vama</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Mogu?nosti dijeljenja</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Po?alji privatnu poveznicu e-po?tom?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Kopiraj privatnu poveznicu u me?uspremnik</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4889,43 +5027,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Dijeljenje kontekstnog izbornika</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Odaberi novu lokaciju?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Dijelim ne?to s vama</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Mogu?nosti dijeljenja</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Aktivnost</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Kopiraj privatnu poveznicu u me?uspremnik</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Po?alji privatnu poveznicu e-po?tom?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4941,11 +5053,6 @@
<translation>Ponovno dijeljenje ove mape nije dopu?teno</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Kopiraj internu poveznicu</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -4972,12 +5079,6 @@
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Otvori u pregledniku</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Rije?i nepodudaranje?</translation>
@@ -5007,6 +5108,17 @@
<source>Delete</source>
<translation>Izbri?i</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Kopiraj internu poveznicu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Otvori u pregledniku</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5108,13 +5220,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Ova veza NIJE sigurna jer nije ?ifrirana.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Ina?ica poslu?itelja: %1</translation>
@@ -5134,6 +5239,13 @@
<source>The connection is not secure</source>
<translation>Veza nije sigurna</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Ova veza NIJE sigurna jer nije ?ifrirana.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5226,6 +5338,32 @@
<translation>%1 (presko?eno zbog prethodne pogre?ke, poku?ajte ponovno za %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Dostupno je samo %1, za pokretanje je potrebno najmanje %2</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>Nije mogu?e otvoriti ili stvoriti lokalnu sinkronizacijsku bazu podataka. Provjerite imate li pristup pisanju u mapi za sinkronizaciju.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Premalo prostora na disku: presko?ena su preuzimanja koja bi smanjila slobodni prostor ispod %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>Na nekim poslu?iteljima nema dovoljno slobodnog prostora za odre?ene otpreme.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Nerije?eno nepodudaranje.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>Neuspje?no a?uriranje datoteke: %1</translation>
@@ -5246,22 +5384,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Nerije?eno nepodudaranje.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Dostupno je samo %1, za pokretanje je potrebno najmanje %2</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>Nije mogu?e otvoriti ili stvoriti lokalnu sinkronizacijsku bazu podataka. Provjerite imate li pristup pisanju u mapi za sinkronizaciju.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Upotrebljavaju se virtualne datoteke sa sufiksom, ali sufiks nije odre?en</translation>
@@ -5281,16 +5403,6 @@
<source>Cannot open the sync journal</source>
<translation>Nije mogu?e otvoriti sinkronizacijski dnevnik</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Premalo prostora na disku: presko?ena su preuzimanja koja bi smanjila slobodni prostor ispod %1.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>Na nekim poslu?iteljima nema dovoljno slobodnog prostora za odre?ene otpreme.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5301,7 +5413,7 @@
<translation>Izvanmre?no</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5685,11 +5797,6 @@
<source>Less than a minute</source>
<translation>Prije manje od minute</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5697,20 +5804,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5725,6 +5822,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5867,6 +5979,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Prijavite se</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>Nema konfiguriranih mapa za sinkronizaciju.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Odspojen od %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Nepodr?ana ina?ica poslu?itelja</translation>
@@ -5887,31 +6014,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Odspojen od %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Odspojen od ra?una:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Ra?un %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Prijavite se</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Sinkronizacija ra?una je onemogu?ena</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5933,11 +6035,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>Nema konfiguriranih mapa za sinkronizaciju.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Provjera za promjene u udaljenom ?%1?</translation>
@@ -5948,6 +6045,21 @@
<translation>Provjera za promjene u lokalnom ?%1?</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Odspojen od ra?una:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Ra?un %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Sinkronizacija ra?una je onemogu?ena</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5956,11 +6068,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Lokalna mapa</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation type="unfinished"/>
@@ -5996,22 +6103,11 @@
<translation>Pitaj prije sinkronizacije mapa ve?ih od</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Pitaj prije sinkronizacije vanjskih pohrana</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Odaberite ?to sinkronizirati</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Zadr?i lokalne podatke</translation>
@@ -6026,6 +6122,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Izbri?i lokalnu mapu i pokreni novu sinkronizaciju</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Odaberite ?to sinkronizirati</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Lokalna mapa</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6066,6 +6178,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>u budu?nosti</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>sada</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Prije nekog vremena</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6106,57 +6263,12 @@
<source>Synced %1</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>u budu?nosti</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>sada</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Prije nekog vremena</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6402,6 +6514,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6591,16 +6746,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6615,6 +6760,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6848,16 +7003,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Priprema za sinkronizaciju</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Priprema za sinkronizaciju</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Sinkronizacija je pauzirana</translation>
@@ -6916,4 +7071,17 @@
<translation>Oslobodi lokalni prostor za pohranu</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_hu.ts nextcloud-desktop-3.16.6/translations/client_hu.ts
--- nextcloud-desktop-3.16.4/translations/client_hu.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_hu.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>Gyors szinkroniz?l?s enged?lyez?se</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>A gyors szinkroniz?l?s csak a felfedezett mapp?kon bel?li f?jlok ?s mapp?k v?ltoz?sait szinkroniz?lja. Ez jelent?sen n?velheti a reakci?k?szs?get a virtu?lis f?jlok kezdeti be?ll?t?sakor, azonban a m?g fel nem fedezett mapp?kba ?thelyezett f?jlok redund?ns let?lt?s?t okozza.</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>Virtu?lis f?jlok enged?lyez?se</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -557,7 +549,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Import?l?s ?r?k?lt kliensb?l</translation>
</message>
@@ -572,7 +564,7 @@
<translation>Kihagy?s</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>Nem siker?lt a fi?kok import?l?sa az ?r?k?lt kliensbe?ll?t?sokb?l.</translation>
</message>
@@ -580,33 +572,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>T?rhely m?rete: ...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>A ki nem v?lasztott mapp?k <b>t?rl?sre ker?lnek</b> a helyi f?jlrendszerr?l, ?s a tov?bbiakban nem lesznek szinkroniz?lva erre a sz?m?t?g?pre.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>M?gse</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Alkalmaz</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Kapcsol?dva <user> felhaszn?l?val ehhez: <server></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Minden szinkroniz?l?sa</translation>
@@ -637,6 +607,33 @@
<translation>Csatlakoz?si be?ll?t?sok</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Alkalmaz</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>T?rhely m?rete: ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>M?gse</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Kapcsol?dva <user> felhaszn?l?val ehhez: <server></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Nincs fi?k be?ll?tva.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>V?gpontok k?zti titkos?t?s virtu?lis f?jlokkal</translation>
@@ -671,9 +668,9 @@
<b>Ez a folyamat nem ford?that? vissza. Biztos, hogy folytatja?</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Nincs fi?k be?ll?tva.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -686,6 +683,11 @@
<translation>Mnemonikus kulcs megjelen?t?se</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>A v?gpontok k?z?tti titkos?t?s enged?lyezett enn?l a fi?kn?l</translation>
@@ -711,6 +713,12 @@
<translation>A mapp?nak szinkroniz?l?si hib?ja van. A mappa titkos?t?sa a sikeres szinkroniz?l?s ut?n lesz lehets?ges.</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -735,12 +743,6 @@
<translation>Nem lehetett titkos?tani a mapp?t, mert m?r nem l?tezik</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Mappa megnyit?sa</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Titkos?t?s</translation>
@@ -779,16 +781,6 @@
<translation>Szinkroniz?l?s ?jraind?t?sa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Szinkroniz?l?s folytat?sa</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Szinkroniz?l?s sz?neteltet?se</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Mappa szinkroniz?l?si kapcsolat?nak elt?vol?t?sa</translation>
@@ -814,21 +806,11 @@
<translation>Mappa l?trehoz?sa sikertelen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>A helyi mappa nem hozhat? l?tre: <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Mappa szinkroniz?ci?s kapcsolat?nak elt?vol?t?s?nak meger?s?t?se</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>T?nyleg le?ll?tja a(z) <i>%1</i> mappa szinkroniz?l?s?t?</p><p><b>Megjegyz?s:</b> Ez <b>nem</b> t?r?l f?jlokat.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Mappa szinkroniz?l?si kapcsolat?nak elt?vol?t?sa</translation>
@@ -862,24 +844,24 @@
<translation>V?gpontok k?z?tti titkos?t?s mnemonikus kulcsa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>A kriptogr?fiai szem?lyazonoss?ga megv?d?s?hez, egy 12 sz?t?ri sz?b?l ?ll? mnemonikus kulccsal titkos?tjuk. Jegyezze meg ezeket, ?s tartsa azokat biztons?gban. Sz?ks?ge lesz r?juk, ha egy ?j eszk?zt akar hozz?adni a fi?kj?hoz (p?ld?ul a mobiltelefonj?t vagy a laptopj?t).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>V?gpontok k?zti titkos?t?s letilt?sa</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>Letiltja a v?gpontok k?zti titkos?t?st a k?vetkez?n?l: %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>A v?gpontok k?zti titkos?t?s elt?vol?t?sa t?rli azokat a helyben szinkroniz?lt f?jlokat, melyek titkos?tottak.<br>A titkos?tott f?jlok megmaradnak a kiszolg?l?n.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -892,34 +874,44 @@
<translation>A szinkroniz?l?s folyamatban van. <br/>Megszak?tja?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) / %2 haszn?latban. N?h?ny mappa ? bele?rtve a h?l?zati megoszt?sokat ?s a megosztott k?nyvt?rakat ? elt?r? korl?toz?ssal rendelkezhet.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 haszn?latban</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 / %2 haszn?latban</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>Tan?s?tv?ny ?tk?lt?ztet?se egy ?jra</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Jelenleg nem ?rhet?ek el a t?rhelyhaszn?lati inform?ci?k.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>Vannak olyan mapp?k, amelyek m?rete nagyobb mint %1 MB: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 haszn?latban</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 mint %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>A v?gpontok k?zti titkos?t?s egy m?sik eszk?zr?l enged?lyezve lett ezen a fi?kon.<br>A mnemonikus kulcs megad?s?val ezen az eszk?z?n is enged?lyezheti.<br>Ez enged?lyezi a megl?v? titkos?tott mapp?k szinkroniz?ci?j?t.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>A(z) %1 kiszolg?l?verzi? nem t?mogatott. Folyat?s csak saj?t felel?ss?gre.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Titkos?t?s be?ll?t?sa</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Ez a fi?k t?mogatja a v?gpontok k?z?tti titkos?t?st</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -937,79 +929,125 @@
<translation>A(z) %1 kiszolg?l? jelenleg karbantart?si m?dban van.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>A(z) %1 kiszolg?l?t jelenleg ?tir?ny?tj?k, vagy a kapcsolata egy bel?ptet? port?l m?g?tt van.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Kijelentkezve innen: %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Kapcsol?d?s ehhez: %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Az al?bbi mapp?k nem lettek szinkroniz?lva, mert t?l nagyok:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>Nem lehets?ges a csatlakoz?s a k?vetkez?h?z: %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Az al?bbi mapp?k nem lettek szinkroniz?lva, mert k?ls? t?rol?k:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Kiszolg?l? konfigur?ci?s hiba: %1, itt: %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Az al?bbi mapp?k nem lettek szinkroniz?lva, mert t?l nagyok, vagy k?ls? t?rol?k:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>El kell fogadnia a(z) %1 szolg?ltat?si felt?teleit.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Mappa megnyit?sa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Nincs %1 kapcsolat be?ll?tva.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Szinkroniz?l?s folytat?sa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>Tan?s?tv?ny ?tk?lt?ztet?se egy ?jra</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Szinkroniz?l?s sz?neteltet?se</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Az al?bbi mapp?k nem lettek szinkroniz?lva, mert t?l nagyok:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>A helyi mappa nem hozhat? l?tre: <i>%1</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Az al?bbi mapp?k nem lettek szinkroniz?lva, mert k?ls? t?rol?k:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>T?nyleg le?ll?tja a(z) <i>%1</i> mappa szinkroniz?l?s?t?</p><p><b>Megjegyz?s:</b> Ez <b>nem</b> t?r?l f?jlokat.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Az al?bbi mapp?k nem lettek szinkroniz?lva, mert t?l nagyok, vagy k?ls? t?rol?k:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>A kriptogr?fiai szem?lyazonoss?ga megv?d?s?hez, egy 12 sz?t?ri sz?b?l ?ll? mnemonikus kulccsal titkos?tjuk. Jegyezze meg ezeket, ?s tartsa azokat biztons?gban. Sz?ks?ge lesz r?juk, ha egy ?j eszk?zt akar hozz?adni a fi?kj?hoz (p?ld?ul a mobiltelefonj?t vagy a laptopj?t).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>Vannak olyan mapp?k, amelyek m?rete nagyobb mint %1 MB: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>V?gpontok k?zti titkos?t?s letilt?sa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>A v?gpontok k?zti titkos?t?s egy m?sik eszk?zr?l enged?lyezve lett ezen a fi?kon.<br>A mnemonikus kulcs megad?s?val ezen az eszk?z?n is enged?lyezheti.<br>Ez enged?lyezi a megl?v? titkos?tott mapp?k szinkroniz?ci?j?t.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>Letiltja a v?gpontok k?zti titkos?t?st a k?vetkez?n?l: %1?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Ez a fi?k t?mogatja a v?gpontok k?z?tti titkos?t?st</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>A v?gpontok k?zti titkos?t?s elt?vol?t?sa t?rli azokat a helyben szinkroniz?lt f?jlokat, melyek titkos?tottak.<br>A titkos?tott f?jlok megmaradnak a kiszolg?l?n.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Titkos?t?s be?ll?t?sa</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) / %2 haszn?latban. N?h?ny mappa ? bele?rtve a h?l?zati megoszt?sokat ?s a megosztott k?nyvt?rakat ? elt?r? korl?toz?ssal rendelkezhet.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 / %2 haszn?latban</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Jelenleg nem ?rhet?ek el a t?rhelyhaszn?lati inform?ci?k.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 mint %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>A(z) %1 kiszolg?l?verzi? nem t?mogatott. Folyat?s csak saj?t felel?ss?gre.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>A(z) %1 kiszolg?l?t jelenleg ?tir?ny?tj?k, vagy a kapcsolata egy bel?ptet? port?l m?g?tt van.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Kapcsol?d?s ehhez: %1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>Nem lehets?ges a csatlakoz?s a k?vetkez?h?z: %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Kiszolg?l? konfigur?ci?s hiba: %1, itt: %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>El kell fogadnia a(z) %1 szolg?ltat?si felt?teleit.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Nincs %1 kapcsolat be?ll?tva.</translation>
</message>
</context>
<context>
@@ -1124,11 +1162,6 @@
<translation>Tan?s?tv?ny ?s kulcs (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Tall?z?s?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Tan?s?tv?ny jelszava:</translation>
@@ -1139,6 +1172,11 @@
<translation>A titkos?tott pkcs12 csomag er?sen aj?nlott, mivel egy p?ld?nyt a konfigur?ci?s f?jlban lesz t?rolva.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Tall?z?s?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>V?lasszon tan?s?tv?nyt</translation>
@@ -1189,34 +1227,34 @@
<translation>Folytat?s</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 fi?k</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 fi?k</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 mappa</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 mappa</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Import?l?s ?r?k?lt kliensb?l</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1224,12 +1262,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Hiba a konfigur?ci?s f?jl el?r?sekor</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>Hiba t?rt?nt a k?vetkez? konfigur?ci?s f?jl el?r?sekor: %1. Gy?z?dj?n meg r?la, hogy a f?jlt el?ri a rendszerfi?k.</translation>
</message>
@@ -1271,6 +1309,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1278,6 +1355,11 @@
<translation>A(z) %1 f?jl nem t?lthet? fel, mert l?tezik egy f?jl ugyanezzel a n?vvel, ?gy hogy csak kis- ?s nagybet?kben t?r el.</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>A(z) %1 f?jl m?dos?t?si ideje ?rv?nytelen. Ne t?ltse fel a kiszolg?l?ra.</translation>
@@ -1482,7 +1564,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Hiba a metaadatok adatb?zisba ?r?sakor</translation>
</message>
@@ -1612,21 +1694,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>V?glegesen t?rli a(z) <i>%1</i> k?nyvt?rat ?s annak minden tartalm?t?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>V?glegesen t?rli a(z) <i>%1</i> f?jlt?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>T?rl?s meger?s?t?se</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1642,30 +1709,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Nincs Nextcloud fi?k be?ll?tva</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>V?glegesen t?rli a(z) <i>%1</i> k?nyvt?rat ?s annak minden tartalm?t?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Hiteles?t?si hiba: A felhaszn?l?n?v vagy a jelsz? hib?s.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>V?glegesen t?rli a(z) <i>%1</i> f?jlt?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>T?rl?s meger?s?t?se</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Id?t?ll?p?s</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>A megadott hiteles?t? adatok helytelenek</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>A be?ll?tott kiszolg?l? t?l r?gi ehhez a klienshez</translation>
@@ -1675,16 +1742,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Friss?tse a kiszolg?l?t a legfrissebb verzi?ra, ?s ind?tsa ?jra a klienst.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Hiteles?t?si hiba: A felhaszn?l?n?v vagy a jelsz? hib?s.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Nincs Nextcloud fi?k be?ll?tva</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>A megadott hiteles?t? adatok helytelenek</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Hiba a f?jl t?rl?s?nek megszak?t?sa sor?n</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>Hiba a(z) %1 t?rl?s?nek megszak?t?sa sor?n</translation>
</message>
@@ -1692,19 +1774,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Kiszolg?l?hiba: A PROPFIND v?lasz nem XML form?tum?!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>Titkos?tott metaadatok be?ll?t?si hib?ja!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>Titkos?tott metaadatok be?ll?t?si hib?ja: a kiszolg?l? kezdeti al??r?sa ?res.</translation>
</message>
@@ -1712,27 +1794,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Hiba t?rt?nt a(z) %1 k?nyvt?r megnyit?sakor</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>A k?nyvt?r nem ?rhet? el a kliensen, az enged?ly megtagadva</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>A k?nyvt?r nem tal?lhat?: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>A f?jln?v k?dol?sa ?rv?nytelen</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Hiba t?rt?nt a(z) %1 k?nyvt?r olvas?sa sor?n</translation>
</message>
@@ -1972,11 +2054,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>A lek?rdez?si URL nem HTTPS-sel kezd?dik, pedig a bejelentkez?si URL HTTPS-sel kezd?d?tt. A bejelentkez?s nem lesz lehets?ges, mert biztons?gi probl?m?t jelenthet. L?pjen kapcsolatba a rendszergazd?val.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>A visszaadott kiszolg?l? URL nem HTTPS-sel kezd?dik, pedig a bejelentkez?si URL HTTPS-sel kezd?d?tt. A bejelentkez?s nem lesz lehets?ges, mert biztons?gi probl?m?t jelenthet. L?pjen kapcsolatba a rendszergazd?val.</translation>
@@ -1988,28 +2065,33 @@
<translation>A kiszolg?l? hib?t adott vissza: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>A lek?rdez?si URL nem HTTPS-sel kezd?dik, pedig a bejelentkez?si URL HTTPS-sel kezd?d?tt. A bejelentkez?s nem lesz lehets?ges, mert biztons?gi probl?m?t jelenthet. L?pjen kapcsolatba a rendszergazd?val.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Hiba t?rt?nt a ?token? v?gpont el?r?sekor: <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>A kiszolg?l?t?l visszakapott JSON nem dolgozhat? fel: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>A kiszolg?l? v?lasza nem tartalmazta az ?sszes v?rt mez?t</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>A kiszolg?l?t?l visszakapott JSON nem dolgozhat? fel: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2052,6 +2134,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>A(z) %1 sikeresen elt?vol?tva.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>A(z) %1 sikeresen felt?ltve.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>A(z) %1 ?tnevezve erre: %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>A(z) %1 ?thelyezve ide: %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>V?lasszon egy m?sik helyet. A(z) %1 mappa nem l?tezik.</translation>
@@ -2067,17 +2177,6 @@
<translation>V?lasszon egy m?sik helyet. A(z) %1 mappa nem olvashat?.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>A(z) %1 ?s %d tov?bbi f?jl t?r?lve.</numerusform><numerusform>A(z) %1 ?s %d tov?bbi f?jl t?r?lve.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>A(z) %1 sikeresen elt?vol?tva.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>A(z) %1 ?s %n tov?bbi f?jl hozz?adva.</numerusform><numerusform>A(z) %1 ?s %n tov?bbi f?jl hozz?adva.</numerusform></translation>
@@ -2093,33 +2192,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>A(z) %1 ?s %n tov?bbi f?jl felt?ltve.</numerusform><numerusform>A(z) %1 ?s %n tov?bbi f?jl felt?ltve.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>A(z) %1 sikeresen felt?ltve.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>A(z) %1 ?tnevezve erre: %2, ?s m?g %n tov?bbi f?jl lett ?tnevezve.</numerusform><numerusform>A(z) %1 ?tnevezve erre: %2, ?s m?g %n tov?bbi f?jl lett ?tnevezve.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>A(z) %1 ?tnevezve erre: %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>A(z) %1 ?thelyezve ide: %2, ?s m?g %n tov?bbi f?jl ?thelyezve.</numerusform><numerusform>A(z) %1 ?thelyezve ide: %2, ?s m?g %n tov?bbi f?jl ?thelyezve.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>A(z) %1 ?thelyezve ide: %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2156,68 +2238,68 @@
<translation>Szinkroniz?l?si tev?kenys?g</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Nem lehetett beolvasni a rendszer kiz?r?si f?jlj?t</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Egy %1 MB m?retet meghalad? mappa lett hozz?adva: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Egy k?ls? t?rol?b?l sz?rmaz? mappa lett hozz?adva.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>A be?ll?t?sokn?l v?lassza ki, ha le szeretn? t?lteni.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>Egy mappa t?ll?pte a be?ll?tott %1 MB-os mappam?rethat?rt: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>Tov?bb szinkroniz?l?s</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>Szinkroniz?l?s megszak?t?sa</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>A mappa t?ll?pte a be?ll?tott %2MB-os mappam?rethat?rt: %1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>Le?ll?tja a mappa szinkroniz?ci?j?t?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>A(z) %1 mappa l?tre lett hozva, de el?z?leg ki lett hagyva a szinkroniz?l?sb?l. A benne l?v? adatok nem lesznek szinkroniz?lva.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>A(z) %1 f?jl l?tre lett hozva, de el?z?leg ki lett hagyva a szinkroniz?l?sb?l. Nem lesz szinkroniz?lva.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2230,12 +2312,12 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>A virtu?lis f?jl let?lt?se ?%1? k?ddal, ?%2? ?llapottal ?s ?%3? hiba?zenettel sikertelen volt.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2244,7 +2326,7 @@
Ellenkez? esetben az ?sszes t?r?lt f?jlt helyre?ll?thatja a(z) ?%1? mapp?b?l a kiszolg?l?ra t?rt?n? felt?lt?ssel.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2253,22 +2335,22 @@
Ellenkez? esetben az ?sszes t?r?lt f?jlt helyre?ll?thatja a kiszolg?l?r?l t?rt?n? let?lt?ssel.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>Elt?vol?tja az ?sszes f?jlt?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>T?rl?s folytat?sa</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>F?jlok helyre?ll?t?sa a kiszolg?l?ra</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>F?jlok helyre?ll?t?sa a kiszolg?l?r?l</translation>
</message>
@@ -2309,11 +2391,6 @@
<translation>A mappa ?llapot?t nem lehet vissz?ll?tani</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>Egy r?gi szinkroniz?l?si napl?f?jl tal?lhat?: ?%1?, de az nem t?r?lhet?. Gy?z?dj?n meg r?la, hogy jelenleg egy alkalmaz?s sem haszn?lja.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(biztons?gi ment?s)</translation>
@@ -2324,6 +2401,11 @@
<translation>(biztons?gi ment?s: %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>Egy r?gi szinkroniz?l?si napl?f?jl tal?lhat?: ?%1?, de az nem t?r?lhet?. Gy?z?dj?n meg r?la, hogy jelenleg egy alkalmaz?s sem haszn?lja.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Nem defini?lt ?llapot.</translation>
@@ -2394,16 +2476,6 @@
<translation>Szinkroniz?l?si k?r?s megszak?tva.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Szinkroniz?l?s meg?ll?tva.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (szinkroniz?l?s meg?ll?tva)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>V?lasszon egy m?sik helyet. A kiv?lasztott mappa nem ?rv?nyes.</translation>
@@ -2453,6 +2525,16 @@
A probl?ma megold?sa: t?vol?tsa el a(z) %1 mapp?t az egyik fi?kb?l, ?s hozzon l?tre egy ?j szinkroniz?l?si mapp?t.
Halad? felhaszn?l?k sz?m?ra: a probl?m?nak ahhoz lehet k?ze, hogy t?bb szinkroniz?l?si adatb?zisf?jl tal?lhat? egy mapp?ban. Ellen?rizze a(z) %1 mapp?ban az elavult ?s nem haszn?lt .sync_*.db f?jlokat, ?s t?vol?tsa el ?ket.</translation>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Szinkroniz?l?s meg?ll?tva.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (szinkroniz?l?s meg?ll?tva)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2496,16 +2578,6 @@
<translation>Hiba t?rt?nt a kiszolg?l?n lev? mapp?k list?j?nak bet?lt?sekor.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Mappalista let?lt?se a kiszolg?l?r?l?</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Feloldatlan ?tk?z?sek vannak. Kattintson a r?szletek?rt.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>A virtu?lis f?jl t?mogat?s enged?lyezett.</translation>
@@ -2547,16 +2619,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>Let?lt?s: %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>%1 / %2 f?jl</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Feloldatlan ?tk?z?sek vannak. Kattintson a r?szletek?rt.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>Let?lt?s: %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Mappalista let?lt?se a kiszolg?l?r?l?</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2603,21 +2690,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 / %2, %3 / %4 f?jl</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>%1 / %2 f?jl</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>V?rakoz?s %n tov?bbi mapp?ra?</numerusform><numerusform>V?rakoz?s %n tov?bbi mapp?ra?</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>Szinkroniz?l?s megkezd?se</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>V?rakoz?s %n tov?bbi mapp?ra?</numerusform><numerusform>V?rakoz?s %n tov?bbi mapp?ra?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2777,11 +2859,6 @@
<translation>?ltal?nos be?ll?t?sok</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Ind?t?s a rendszerrel egy?tt</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>H?v?s?rtes?t?sek megjelen?t?se</translation>
@@ -2792,11 +2869,6 @@
<translation>Rendszert?lc?ra</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>&Monokr?m ikonok haszn?lata</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>Cseveg?si ?rtes?t?sek megjelen?t?se</translation>
@@ -2812,17 +2884,32 @@
<translation>Speci?lis</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Meger?s?t?s k?r?se az enn?l nagyobb ?j mapp?k szinkroniz?l?sa el?tt:</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Meger?s?t?s k?r?se a k?ls? t?rol?k szinkroniz?l?sa el?tt</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Ind?t?s a rendszerrel egy?tt</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>&Monokr?m ikonok haszn?lata</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Meger?s?t?s k?r?se az enn?l nagyobb ?j mapp?k szinkroniz?l?sa el?tt:</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>?rtes?t?s, ha a szinkroniz?lt mapp?k a megadott hat?r?rt?kn?l nagyobbra n?nek</translation>
@@ -2833,11 +2920,6 @@
<translation>Az ?rintett mapp?k szinkroniz?l?s?nak automatikus letilt?sa a korl?t t?ll?p?sekor</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Meger?s?t?s k?r?se a k?ls? t?rol?k szinkroniz?l?sa el?tt</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>Az elt?vol?tott f?jlok kuk?ba helyez?se</translation>
@@ -2889,11 +2971,6 @@
<translation>Friss?t?si csatorna</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>?j&raind?t?s ?s friss?t?s</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>Friss?t?sek &automatikus keres?se</translation>
@@ -2914,6 +2991,16 @@
<translation>Jogi inform?ci?k</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>?j&raind?t?s ?s friss?t?s</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Kiszolg?l??rtes?t?sek, melyek a figyelm?t k?rik.</translation>
@@ -2934,6 +3021,11 @@
<translation>Az automatikus ind?t?st nem tilthatja le, mert az eg?sz rendszerre kiterjed? automatikus ind?t?s enged?lyezett.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>stabil</translation>
@@ -3015,6 +3107,11 @@
<source>Debug archive is created at %1</source>
<translation>A hibakeres?si arch?vum itt lett l?trehozva: %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3179,102 +3276,97 @@
<translation>?j f?jln?v</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>F?jl ?tnevez?se</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>A(z) ?%1? f?jlt nem siker?lt szinkroniz?lni, mert a neve a rendszeren nem megengedett karaktereket tartalmaz.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>A k?vetkez? karakterek nem enged?lyezettek a rendszeren: * " | & ? , ; : \ / ~ < > kezd? ?s z?r? sz?k?z</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>A(z) ?%1? f?jlt nem siker?lt szinkroniz?lni, mert a neve a kiszolg?l?n nem megengedett karaktereket tartalmaz.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>A k?vetkez? karakterek nem enged?lyezettek: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>A k?vetkez? alapnevek nem enged?lyezettek: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>A k?vetkez? f?jlnevek nem enged?lyezettek: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>A k?vetkez? kiterjeszt?sek nem enged?lyezettek: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>?tnevez?si enged?lyek ellen?rz?se?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>Nincs enged?lye ?tnevezni ezt a f?jlt. K?rje meg a f?jl szerz?j?t, hogy nevezze ?t.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>Az enged?lyek lek?r?se sikertelen, a hiba a k?vetkez?: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>A f?jln?v kezd? ?s z?r? sz?k?zt tartalmaz.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>A f?jln?v kezd? sz?k?zt tartalmaz.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>A f?jln?v z?r? sz?k?zt tartalmaz.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>?rv?nytelen n?v haszn?lata</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>A f?jln?v ?rv?nytelen karaktereket tartalmaz: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>A f?jl nem nevezhet? ?t. Gy?z?dj?n meg r?la, hogy kapcsol?dik-e a kiszolg?l?hoz</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>A f?jl nem nevezhet? ?t, mert l?tezik egy ugyanilyen nev? f?jl a kiszolg?l?n. V?lasszon m?sik nevet.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>A helyi f?jl nem hozhat? l?tre. %1</translation>
</message>
@@ -3399,16 +3491,6 @@
<translation><p>A(z) %1 kliens ?j verzi?ja ?rhet? el.</p><p>A(z) <b>%2</b> let?lthet?. A telep?tett verzi?: %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Kihagy?s ez alkalommal</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Friss?t?s beszerz?se</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>Friss?t?s sikertelen</translation>
@@ -3433,6 +3515,16 @@
<source>Update manually</source>
<translation>K?zi friss?t?s</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Kihagy?s ez alkalommal</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Friss?t?s beszerz?se</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3457,6 +3549,23 @@
<translation>A proxy kiszolg?l? hiteles?t?st ig?nyel</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Let?lt?si s?vsz?less?g</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Korl?tozva</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KB?jt/mp</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>Megjegyz?s: A proxy be?ll?t?sai nincsenek hat?ssal a localhoston tal?lhat? fi?kokra</translation>
@@ -3479,46 +3588,29 @@
<translation>Glob?lis be?ll?t?sok haszn?lata</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Let?lt?si s?vsz?less?g</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Nincs korl?toz?s</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KB?jt/mp</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Korl?tozva</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Korl?toz?s az elm?leti s?vsz?less?g 3/4-?re</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Felt?lt?si s?vsz?less?g</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Korl?toz?s automatikusan</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Felt?lt?si s?vsz?less?g</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Proxy kiszolg?l? g?pneve</translation>
@@ -3547,6 +3639,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>A friss?t?sek nem ellen?rizhat?ek.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Friss?t?si kiszolg?l? ellen?rz?se ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>?j %1 friss?t?s ?rhet? el</translation>
@@ -3577,11 +3679,6 @@
<translation>Nem lehetett let?lteni a friss?t?st. Kattintson <a href='%1'>ide</a> a friss?t?s k?zi let?lt?s?hez.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>A friss?t?sek nem ellen?rizhat?ek.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>?j %1 ?rhet? el. A friss?t?s let?lt?s?hez nyissa meg a <a href='%2'>%2ot</a>.</translation>
@@ -3592,16 +3689,21 @@
<translation>?j %1 el?rhet?. A friss?t?s let?lt?s?hez nyissa meg ezt: %2</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Friss?t?si kiszolg?l? ellen?rz?se ?</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Friss?t?si ?llapot ismeretlen: Nem lehet ellen?rizni a friss?t?seket.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Nem ?rhet? el friss?t?s. Az ?n telep?t?se a legfrissebb verzi?t haszn?lja.</translation>
@@ -3777,11 +3879,6 @@
<translation><font color="green">Sikeresen kapcsol?dott ehhez: %1: %2 %3 verzi? (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>?rv?nytelen URL</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>A kapcsol?d?s sikertelen ehhez: %1, itt: %2:<br/>%3</translation>
@@ -3792,6 +3889,16 @@
<translation>Id?t?ll?p?s az ehhez kapcsol?d?s k?zben: %1, itt: %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>A hozz?f?r?st megtagadta a kiszolg?l?. Annak ellen?rz?s?hez, hogy a megfelel? hozz?f?r?ssel rendelkezik, <a href="%1">kattintson ide</a> a szolg?ltat?s b?ng?sz?b?l t?rt?n? el?r?s?hez.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>?rv?nytelen URL</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Kapcsol?d?si k?s?rlet ehhez: %1, itt: %2?</translation>
@@ -3802,11 +3909,6 @@
<translation>A hiteles?tett kiszolg?l?k?r?s ?t lett ir?ny?tva ide: ?%1?. Az URL hib?s, a kiszolg?l? rosszul van be?ll?tva.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>A hozz?f?r?st megtagadta a kiszolg?l?. Annak ellen?rz?s?hez, hogy a megfelel? hozz?f?r?ssel rendelkezik, <a href="%1">kattintson ide</a> a szolg?ltat?s b?ng?sz?b?l t?rt?n? el?r?s?hez.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>?rv?nytelen v?lasz ?rkezett a hiteles?tett WebDAV k?r?sre</translation>
@@ -4018,62 +4120,34 @@
<translation>A pontokkal v?gz?d? f?jlneveket ez a f?jlrendszer nem t?mogatja.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>mappa</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>f?jl</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>A(z) ?%2? karaktert tartalmaz? %1nevek nem t?mogatottak ezen a f?jlrendszeren.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>A %1n?v legal?bb egy ?rv?nytelen karaktert tartalmaz.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>A %1n?v egy fenntartott n?v ezen a f?jlrendszeren.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>A f?jln?v legal?bb egy ?rv?nytelen karaktert tartalmaz</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4083,6 +4157,24 @@
<translation>A f?jln?v z?r? sz?k?zt tartalmaz.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>mappa</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>f?jl</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>A(z) ?%2? karaktert tartalmaz? %1nevek nem t?mogatottak ezen a f?jlrendszeren.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4091,6 +4183,16 @@
<translation>Nem nevezhet? ?t vagy t?lthet? fel.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>A %1n?v legal?bb egy ?rv?nytelen karaktert tartalmaz.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>A %1n?v egy fenntartott n?v ezen a f?jlrendszeren.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>A f?jln?v kezd? sz?k?zt tartalmaz.</translation>
@@ -4181,64 +4283,74 @@
<translation>Kiszolg?l? jelent?se: hi?nyz? %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Az ?rv?nytelen m?dos?t?si id? miatt nem lehet szinkroniz?lni</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>Nem siker?lt felt?lteni a f?jlt, mert meg van nyitva itt: ?%1?.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>Hiba t?rt?nt a(z) %1 f?jlrekord adatb?zisb?l t?rl?se sor?n</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>?rv?nytelen c?lba mozgat?s, helyre?ll?t?s</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>A titkos?tott elem nem m?dos?that?, mert a kiv?lasztott tan?s?tv?ny nem ?rv?nyes.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>A ?v?lassza ki a szinkroniz?lni k?v?nt elemeket? feketelista miatt figyelmen k?v?l hagyva</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Nem enged?lyezett, mert nincs enged?lye almapp?k hozz?ad?s?hoz az adott a mapp?hoz</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Nem enged?lyezett, mert nincs enged?lye f?jlok hozz?ad?s?ra az adott mapp?ban</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Ezt a f?jlt nem lehet felt?lteni, mert csak olvashat? a kiszolg?l?n, helyre?ll?t?s</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>Az elt?vol?t?s nem enged?lyezett, helyre?ll?t?s</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Hiba t?rt?nt az adatb?zis olvas?sa sor?n</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>A kiszolg?l? a k?vetkez? hib?val v?laszolt a(z) ?%1? k?nyvt?r olvas?sa sor?n: %2</translation>
</message>
@@ -4246,38 +4358,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>A(z) %1 f?jl t?rl?se a helyi adatb?zisb?l nem siker?lt</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>Az ?rv?nytelen m?dos?t?si id? miatt hiba t?rt?nt a metaadatok friss?t?se sor?n</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>A(z) %1 mappa nem tehet? csak olvashat?v?: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>ismeretlen kiv?tel</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Hiba a metaadatok friss?t?sekor: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>A f?jl jelenleg haszn?latban van</translation>
</message>
@@ -4295,12 +4407,6 @@
<translation>A(z) %1 f?jl nem t?lthet? le, mert hi?nyoznak a titkos?t?si inform?ci?k.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>A f?jl v?ltozott a felfedez?se ?ta</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4357,6 +4463,12 @@
<source>The file %1 is currently in use</source>
<translation>A(z) %1 f?jl ?pp haszn?latban van</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>A f?jl v?ltozott a felfedez?se ?ta</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4374,39 +4486,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>a(z) %1 f?jl nem t?r?lhet?, hiba: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>A(z) %1 mappa nem hozhat? l?tre, mert helyi f?jl- vagy mappan?vvel ?tk?zik.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>A(z) %1 mappa nem hozhat? l?tre</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>A(z) %1 mappa nem tehet? csak olvashat?v?: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>ismeretlen kiv?tel</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Hiba a metaadatok friss?t?sekor: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>A(z) %1 f?jl jelenleg haszn?latban van</translation>
</message>
@@ -4419,14 +4531,14 @@
<translation>A(z) %1 nem t?vol?that? el egy helyi f?jl n?v?tk?z?se miatt</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>A(z) %1 f?jlrekord t?rl?se a helyi adatb?zisb?l nem siker?lt</translation>
</message>
@@ -4434,49 +4546,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>A(z) %1 mappa nem nevezhet? ?t, mert helyi f?jl- vagy mappan?vvel ?tk?zik.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>A(z) %1 f?jl le lett t?ltve, de helyi f?jln?vvel val? ?tk?z?st eredm?nyezett.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>A(z) %1 f?jl lek?r?se a helyi adatb?zisb?l nem siker?lt</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Hiba a t? ?llapot?nak be?ll?t?sakor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Hiba a metaadatok friss?t?sekor: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>A(z) %1 f?jl ?pp haszn?latban van</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>A k?nyvt?r ?tnevez?s?nek ?tvezet?se a hierarchi?ban sikertelen</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>A f?jl ?tnevez?se sikertelen</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>A(z) %1 f?jlrekord t?rl?se a helyi adatb?zisb?l nem siker?lt</translation>
</message>
@@ -4533,39 +4645,39 @@
<translation>A(z) %1 nem nevezhet? ?t erre: %2, hiba: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Hiba a metaadatok friss?t?sekor: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>A(z) %1 f?jl jelenleg haszn?latban van</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>A kiszolg?l? hib?s HTTP k?dot adott vissza. 201-es k?d v?rt, de ez ?rkezett: ?%1 %2?.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>A(z) %1 f?jl lek?r?se a helyi adatb?zisb?l nem siker?lt</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>A(z) %1 f?jlrekord t?rl?se a helyi adatb?zisb?l nem siker?lt</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Hiba a t? ?llapot?nak be?ll?t?sakor</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Hiba a metaadatok adatb?zisba ?r?sakor</translation>
</message>
@@ -4573,22 +4685,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>Nem siker?lt felt?lteni a titkos?tott f?jlt.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>A(z) %1 f?jl nem t?lthet? fel, mert l?tezik egy f?jl ugyanezzel a n?vvel, ?gy hogy csak kis- ?s nagybet?kben t?r el.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>A(z) %1 felt?lt?se t?ll?pi a mappa kv?t?j?t</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4596,11 +4697,6 @@
<translation>A(z) %1 f?jl m?dos?t?si ideje ?rv?nytelen. Ne t?ltse fel a kiszolg?l?ra.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>F?jl elt?vol?tva (felt?lt?s ind?t?sa) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>A helyi f?jl megv?ltozott a szinkroniz?l?s sor?n. Folytatva lesz.</translation>
@@ -4630,6 +4726,22 @@
<source>The file %1 is currently in use</source>
<translation>A(z) %1 f?jl ?pp haszn?latban van</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>A(z) %1 felt?lt?se t?ll?pi a mappa kv?t?j?t</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>Nem siker?lt felt?lteni a titkos?tott f?jlt.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>F?jl elt?vol?tva (felt?lt?s ind?t?sa) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4878,6 +4990,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Megoszt?s a helyi men?b?l</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Megosztottam ?nnel valamit</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Megoszt?si be?ll?t?sok</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Szem?lyes hivatkoz?s k?ld?se e-mailben?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Szem?lyes hivatkoz?s m?sol?sa a v?g?lapra</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>A k?vetkez? helyen l?v? mappa titkos?t?sa sikertelen: ?%1?</translation>
@@ -4912,43 +5050,17 @@
<translation>A k?vetkez? mappa sikeresen titkos?tva lett: ?%1?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Megoszt?s a helyi men?b?l</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>?j hely kiv?laszt?sa?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Megosztottam ?nnel valamit</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Megoszt?si be?ll?t?sok</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Tev?kenys?g</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Szem?lyes hivatkoz?s m?sol?sa a v?g?lapra</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Szem?lyes hivatkoz?s k?ld?se e-mailben?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>Megoszt?s elhagy?sa</translation>
@@ -4964,11 +5076,6 @@
<translation>A mappa tov?bboszt?sa nem megengedett</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Bels? hivatkoz?s m?sol?sa</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>Titkos?t?s</translation>
@@ -4995,12 +5102,6 @@
<translation><numerusform>%1 perc m?lva lej?r</numerusform><numerusform>%1 perc m?lva lej?r</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Megnyit?s b?ng?sz?ben</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Konfliktus felold?sa?</translation>
@@ -5030,6 +5131,17 @@
<source>Delete</source>
<translation>T?rl?s</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Bels? hivatkoz?s m?sol?sa</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Megnyit?s b?ng?sz?ben</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5131,13 +5243,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Ez a kapcsolat NEM biztons?gos, mivel nem titkos?tott.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Kiszolg?l? verzi?: %1</translation>
@@ -5157,6 +5262,13 @@
<source>The connection is not secure</source>
<translation>A kapcsolat nem biztons?gos</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Ez a kapcsolat NEM biztons?gos, mivel nem titkos?tott.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5249,6 +5361,32 @@
<translation>%1 (egy kor?bbi hiba miatt kihagyva, ?jrapr?b?lkoz?s %s m?lva)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Csak %1 ?rhet? el, de legal?bb %2 kell az ind?t?shoz</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>A helyi szinkroniz?l?si adatb?zis nem nyithat? meg, vagy nem hozhat? l?tre. Gy?z?dj?n meg r?la, hogy rendelkezik-e ?r?si joggal a szinkroniz?l?si mapp?n.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>T?l kev?s a t?rter?let: A let?lt?sek, melyek %1 al? cs?kkentett?k volna a szabad t?rhelyet, kihagy?sra ker?ltek.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>Egyes felt?lt?sekhez nincs el?g hely a kiszolg?l?n.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Nem feloldott ?tk?z?s.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>Nem siker?lt friss?teni a f?jlt: %1</translation>
@@ -5269,22 +5407,6 @@
<translation>A f?jlrekord be?ll?t?sa a helyi adatb?zisban nem siker?lt: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Nem feloldott ?tk?z?s.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Csak %1 ?rhet? el, de legal?bb %2 kell az ind?t?shoz</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>A helyi szinkroniz?l?si adatb?zis nem nyithat? meg, vagy nem hozhat? l?tre. Gy?z?dj?n meg r?la, hogy rendelkezik-e ?r?si joggal a szinkroniz?l?si mapp?n.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Virtu?lis f?jlok haszn?lata ut?taggal, de az ut?tag nincs be?ll?tva</translation>
@@ -5304,16 +5426,6 @@
<source>Cannot open the sync journal</source>
<translation>A szinkroniz?l?si napl? nem nyithat? meg</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>T?l kev?s a t?rter?let: A let?lt?sek, melyek %1 al? cs?kkentett?k volna a szabad t?rhelyet, kihagy?sra ker?ltek.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>Egyes felt?lt?sekhez nincs el?g hely a kiszolg?l?n.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5324,7 +5436,7 @@
<translation>Offline</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>El kell fogadnia a szolg?ltat?si felt?teleket</translation>
</message>
@@ -5708,11 +5820,6 @@
<source>Less than a minute</source>
<translation>Kevesebb mint egy perc</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5720,20 +5827,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1 perc</numerusform><numerusform>%1 perc</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1 ?ra</numerusform><numerusform>%1 ?ra</numerusform></translation>
@@ -5748,6 +5845,21 @@
<source>%1 days</source>
<translation><numerusform>%1 nap</numerusform><numerusform>%1 nap</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5890,6 +6002,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Jelentkezzen be</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>Nincsenek szinkroniz?land? mapp?k be?ll?tva.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Kapcsolat bontva a %1dal</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Nem t?mogatott kiszolg?l?verzi?</translation>
@@ -5910,31 +6037,6 @@
<translation>%1 fi?kja megk?veteli, hogy elfogadja a kiszolg?l? szolg?ltat?si felt?teleit. A rendszer ?tir?ny?tja ?nt, hogy elismerje, hogy elolvasta ?s elfogadja azt: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Kapcsolat bontva a %1dal</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Kapcsolat bontva a fi?kokkal:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>%1 fi?k: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Jelentkezzen be</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Fi?k szinkroniz?l?s letiltva</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5956,11 +6058,6 @@
<translation>%1 macOS VFS: Probl?ma mer?lt fel.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>Nincsenek szinkroniz?land? mapp?k be?ll?tva.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>V?ltoz?sok keres?se a(z) ?%1? t?voli mapp?ban</translation>
@@ -5971,6 +6068,21 @@
<translation>V?ltoz?sok keres?se a(z) ?%1? helyi mapp?ban</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Kapcsolat bontva a fi?kokkal:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>%1 fi?k: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Fi?k szinkroniz?l?s letiltva</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5979,11 +6091,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Helyi mappa</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Felhaszn?l?n?v</translation>
@@ -6019,22 +6126,11 @@
<translation>K?rdezzen, miel?tt szinkroniz?ln? az enn?l nagyobb mapp?kat</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>K?rdezzen a k?ls? t?rol?k szinkroniz?l?sa el?tt</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Szinkroniz?land? elemek kiv?laszt?sa</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Helyi adatok megtart?sa</translation>
@@ -6049,6 +6145,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Helyi mappa t?rl?se ?s tiszta szinkroniz?l?s ind?t?sa</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Szinkroniz?land? elemek kiv?laszt?sa</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Helyi mappa</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6089,6 +6201,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%n n</numerusform><numerusform>%n n</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>a j?v?ben</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%n ?</numerusform><numerusform>%n ?</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1 p</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%n p</numerusform><numerusform>%n p</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>most</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>N?h?ny perccel ezel?tt</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6129,57 +6286,12 @@
<source>Synced %1</source>
<translation>Szinkroniz?lta: %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%n n</numerusform><numerusform>%n n</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>a j?v?ben</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%n ?</numerusform><numerusform>%n ?</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>most</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1 p</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%n p</numerusform><numerusform>%n p</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>N?h?ny perccel ezel?tt</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>A ?#? karakterrel kezd?d? el?r?si utak nem t?mogatottak VFS m?dban.</translation>
@@ -6425,6 +6537,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>Helyi vagy csoportmapp?k megnyit?sa</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Helyi mappa megnyit?sa</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Kapcsol?dva</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>Kapcsolat bontva</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>A(z) ?%1? helyi mappa megnyit?sa</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>A(z) ?%1? csoportmappa megnyit?sa</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>A(z) %1 megnyit?sa a f?jlb?ng?sz?ben</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>Felhaszn?l? csoportmapp?k ?s helyi mapp?k men?je</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6614,16 +6769,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6638,6 +6783,16 @@
<source>%L1 KB</source>
<translation>%L1 kB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6871,16 +7026,16 @@
<translation>Hiba t?rt?nt a telep?t?s sor?n</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Felk?sz?l?s a szinkroniz?l?sra</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>Szinkroniz?l?s le?ll?t?sa</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Felk?sz?l?s a szinkroniz?l?sra</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Szinkroniz?l?s sz?neteltetve</translation>
@@ -6939,4 +7094,17 @@
<translation>Hely felszabad?t?sa ezen az eszk?z?n</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>Gyors szinkroniz?l?s enged?lyez?se</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>A gyors szinkroniz?l?s csak a felfedezett mapp?kon bel?li f?jlok ?s mapp?k v?ltoz?sait szinkroniz?lja. Ez jelent?sen n?velheti a reakci?k?szs?get a virtu?lis f?jlok kezdeti be?ll?t?sakor, azonban a m?g fel nem fedezett mapp?kba ?thelyezett f?jlok redund?ns let?lt?s?t okozza.</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_is.ts nextcloud-desktop-3.16.6/translations/client_is.ts
--- nextcloud-desktop-3.16.4/translations/client_is.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_is.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>Virkja hra?a samstillingu</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -557,7 +549,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Eldri ger? innflutnings</translation>
</message>
@@ -572,7 +564,7 @@
<translation>Sleppa</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -580,34 +572,12 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Geymslur?mi: ?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>?merktar m?ppur ver?a <b>fjarl?g?ar</b> ?r skr?akerfi t?lvunnar ?innar og \n
?v? ekki samstilltar lengur vi? ?essa t?lvu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>H?tta vi?</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Virkja</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Tengd/ur vi? <server> sem <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Samstilla allt</translation>
@@ -638,6 +608,33 @@
<translation>Tengistillingar</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Virkja</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Geymslur?mi: ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>H?tta vi?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Tengd/ur vi? <server> sem <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Enginn a?gangur stilltur.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>Enda-?-enda dulritun me? s?ndarskr?m</translation>
@@ -671,9 +668,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Enginn a?gangur stilltur.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -686,6 +683,11 @@
<translation>Birta sk?ringu til minnis</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>Enda-?-enda dulritun hefur veri? virkju? ? ?essum a?gangi</translation>
@@ -711,6 +713,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -733,12 +741,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Opna m?ppu</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Dulrita</translation>
@@ -777,16 +779,6 @@
<translation>Endurr?sa samstillingu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Halda samstillingu ?fram</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Gera hl? ? samstillingu</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Fjarl?gja samstillingartengingu m?ppu</translation>
@@ -812,22 +804,11 @@
<translation>Ger? m?ppu mist?kst</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Gat ekki b?i? til sta?v?ra m?ppu <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Sta?festa fjarl?gingu ? samstillingartengingu m?ppu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Viltu ? alv?runni h?tta a? samstilla m?ppuna \n
-<i>%1</i>?</p><p><b>Athugi?:</b> ?etta mun <b>ekki</b> ey?a neinum skr?m.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Fjarl?gja samstillingartengingu m?ppu</translation>
@@ -857,23 +838,23 @@
<translation>Sk?ring fyrir enda-?-enda dulritun</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>Gera enda-?-enda dulritun ?virka</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>Gera enda-?-enda dulritun ?virka fyrir %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -887,36 +868,44 @@
<translation>A?ger?in sem samstillir er ? gangi.<br/>Viltu st??va hana?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) af %2 ? notkun. Sumar m?ppur, ?ar me? taldar netm?ppur tengdar ? \n
-skr?akerfi? e?a sameignarm?ppur, g?tu veri? me? ?nnur takm?rk.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 ? notkun</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 af %2 ? notkun</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>?a? eru engar uppl?singar um gagnamagn f?anlegar ? augnablikinu.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 ? notkun</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 sem %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>?j?nninn er af ?tg?fu %1 sem er ekki lengur studd! Ef ?? heldur ?fram er ?a?
-? ??na eigin ?byrg?.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Setja upp dulritun</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>?essi a?gangur sty?ur enda-?-enda dulritun</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -934,80 +923,129 @@
<translation>?j?nninn %1 er ? vi?haldsham.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Skr??ur ?t af %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Tengist vi? %1 ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>?a? eru m?ppur sem ekki eru samstilltar ?v? ??r eru of st?rar: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>T?kst ekki a? tengjast vi? %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>?a? eru m?ppur sem ekki eru samstilltar ?v? ??r ytri eru gagnageymslur: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>?a? eru m?ppur sem ekki eru samstilltar ?v? ??r eru of st?rar e?a eru ytri \n
+gagnageymslur: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Opna m?ppu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Halda samstillingu ?fram</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Gera hl? ? samstillingu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Gat ekki b?i? til sta?v?ra m?ppu <i>%1</i>.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Viltu ? alv?runni h?tta a? samstilla m?ppuna \n
+<i>%1</i>?</p><p><b>Athugi?:</b> ?etta mun <b>ekki</b> ey?a neinum skr?m.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Engin %1 tenging skilgreind.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>Gera enda-?-enda dulritun ?virka</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>Gera enda-?-enda dulritun ?virka fyrir %1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>?a? eru m?ppur sem ekki eru samstilltar ?v? ??r eru of st?rar: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) af %2 ? notkun. Sumar m?ppur, ?ar me? taldar netm?ppur tengdar ? \n
+skr?akerfi? e?a sameignarm?ppur, g?tu veri? me? ?nnur takm?rk.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>?a? eru m?ppur sem ekki eru samstilltar ?v? ??r ytri eru gagnageymslur: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 af %2 ? notkun</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>?a? eru m?ppur sem ekki eru samstilltar ?v? ??r eru of st?rar e?a eru ytri \n
-gagnageymslur: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>?a? eru engar uppl?singar um gagnamagn f?anlegar ? augnablikinu.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 sem %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>?j?nninn er af ?tg?fu %1 sem er ekki lengur studd! Ef ?? heldur ?fram er ?a?
+? ??na eigin ?byrg?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Tengist vi? %1 ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>T?kst ekki a? tengjast vi? %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>?essi a?gangur sty?ur enda-?-enda dulritun</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Setja upp dulritun</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Engin %1 tenging skilgreind.</translation>
</message>
</context>
<context>
@@ -1122,11 +1160,6 @@
<translation>Skilr?ki og lykill (pkcs12) :</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Flakka ?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Lykilor? skilr?kis:</translation>
@@ -1137,6 +1170,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Flakka ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Veldu skilr?ki</translation>
@@ -1187,34 +1225,34 @@
<translation>Halda ?fram</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 notandaa?gangar</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 notandaa?gangur</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 m?ppur</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 mappa</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Eldri ger? innflutnings</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1222,12 +1260,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Villa vi? a? n?lgast stillingaskr?na</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>?a? kom upp villa vi? a? n?lgast stillingaskr?na ? %1. Gakktu ?r skugga um a?
kerfisa?gangurinn hafi heimild til a? vinna me? skr?na.</translation>
@@ -1270,6 +1308,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1278,6 +1355,11 @@
h?-/l?gst?fum er ?egar til sta?ar</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
@@ -1485,7 +1567,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Villa vi? ritun l?sigagna ? gagnagrunninn</translation>
</message>
@@ -1616,21 +1698,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Viltu ?rugglega ey?a m?ppunni <i>%1</i> og ?llu innihaldi hennar endanlega?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Viltu ?rugglega ey?a skr?nni <i>%1</i> endanlega?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Sta?festa ey?ingu</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1646,30 +1713,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Enginn Nextcloud-a?gangur stilltur</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Viltu ?rugglega ey?a m?ppunni <i>%1</i> og ?llu innihaldi hennar endanlega?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Villa ? au?kenningu. Notandanafn e?a lykilor? er rangt.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Viltu ?rugglega ey?a skr?nni <i>%1</i> endanlega?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Sta?festa ey?ingu</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>T?mam?rk</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Uppgefin au?kenni eru ekki r?tt</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>Uppsettur ?j?nn fyrir ?etta forrit er of gamall</translation>
@@ -1679,16 +1746,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Uppf?r?u ? n?jasta ?j?ninn og endurr?stu forriti?.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Villa ? au?kenningu. Notandanafn e?a lykilor? er rangt.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Enginn Nextcloud-a?gangur stilltur</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Uppgefin au?kenni eru ekki r?tt</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation type="unfinished"/>
</message>
@@ -1696,19 +1778,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1716,27 +1798,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Villa vi? a? opna m?ppuna %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Mappa fannst ekki: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>Stafatafla skr?arheitis er ekki gild</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Villa vi? a? lesa m?ppuna %1</translation>
</message>
@@ -1975,11 +2057,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
@@ -1991,15 +2068,14 @@
<translation>Villumelding kom fr? ?j?ninum: <em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
- <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
+ <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
<message>
@@ -2009,10 +2085,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2055,6 +2137,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 hefur veri? fjarl?g?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 var uppf?r?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 hefur veri? endurnefnd sem %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 hefur veri? f?r? ? %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2070,17 +2180,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 og %n skr? til vi?b?tar hafa veri? fjarl?g?ar.</numerusform><numerusform>%1 og %n skr?r til vi?b?tar hafa veri? fjarl?g?ar.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 hefur veri? fjarl?g?.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 og %n skr? til vi?b?tar hefur veri? b?tt vi?.</numerusform><numerusform>%1 og %n skr?m til vi?b?tar hefur veri? b?tt vi?.</numerusform></translation>
@@ -2096,33 +2195,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 og %n skr?r til vi?b?tar hafa veri? uppf?r?ar.</numerusform><numerusform>%1 og %n skr?r til vi?b?tar hafa veri? uppf?r?ar.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 var uppf?r?.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 var endurnefnd sem %2 og %n skr? til vi?b?tar var l?ka endurnefnd.</numerusform><numerusform>%1 var endurnefnd sem %2 og %n skr?r til vi?b?tar voru l?ka endurnefndar.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 hefur veri? endurnefnd sem %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 var f?r? ? %2 og %n skr?r til vi?b?tar voru l?ka f?r?ar.</numerusform><numerusform>%1 var f?r? ? %2 og %n skr?r til vi?b?tar voru l?ka f?r?ar.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 hefur veri? f?r? ? %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2161,67 +2243,67 @@
<translation>Virkni samstillingar</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Gat ekki lesi? kerfis?tilokunarskr?na</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>N?rri m?ppu st?rri en %1 MB var b?tt vi?: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>M?ppu ?r ytri gagnageymslu var b?tt vi?.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Far?u ? stillingarnar til a? velja hana ef ?? vilt s?kja hana.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>Halda samstillingu ?fram</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>St??va samstillingu</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2230,41 +2312,41 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2305,11 +2387,6 @@
<translation>Gat ekki n?llstillt st??u ? m?ppu</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>G?mul atvikaskr? samstillingar "%1" fannst, en var ekki h?gt a? fjarl?gja. Vertu viss um a? ekkert anna? forrit s? ekki a? nota hana.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation> (?ryggisafrit)</translation>
@@ -2320,6 +2397,11 @@
<translation> (?ryggisafrita %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>G?mul atvikaskr? samstillingar "%1" fannst, en var ekki h?gt a? fjarl?gja. Vertu viss um a? ekkert anna? forrit s? ekki a? nota hana.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>?skilgreind sta?a.</translation>
@@ -2390,16 +2472,6 @@
<translation>H?tt var vi? bei?ni um samstillingu.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Samstilling er ? bi?.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (samstilling er ? bi?)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2446,6 +2518,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Samstilling er ? bi?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (samstilling er ? bi?)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2489,16 +2571,6 @@
<translation>Villa vi? a? hla?a inn lista yfir m?ppur fr? vef?j?ninum.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>S?ki lista yfir m?ppur fr? ?j?ni ?</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>?a? eru ?leystir ?rekstrar. Smelltu til a? sko?a n?nar.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation type="unfinished"/>
@@ -2540,16 +2612,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>S?ki %1/sek</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>skr? %1 af %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>?a? eru ?leystir ?rekstrar. Smelltu til a? sko?a n?nar.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>S?ki %1/sek</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>S?ki lista yfir m?ppur fr? ?j?ni ?</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2596,21 +2683,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 af %2, skr? %3 af %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>skr? %1 af %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>B?? eftir %n m?ppu til vi?b?tar ?</numerusform><numerusform>B?? eftir %n m?ppum til vi?b?tar ?</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>Samstilling er ? ?ann mund a? hefjast</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>B?? eftir %n m?ppu til vi?b?tar ?</numerusform><numerusform>B?? eftir %n m?ppum til vi?b?tar ?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2770,11 +2852,6 @@
<translation>Almennar stillingar</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>R?sa ?egar &kveikt ? v?l</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation type="unfinished"/>
@@ -2785,11 +2862,6 @@
<translation>Fyrir kerfisbakka</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Nota einlitar t?kn&myndir</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2805,17 +2877,32 @@
<translation>?tarlegt</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Bi?ja um sta?festingu ??ur en samstilltar eru n?jar m?ppur st?rri en</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Bi?ja um sta?festingu ??ur en samstilltar eru ytri gagnageymslur</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>R?sa ?egar &kveikt ? v?l</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Nota einlitar t?kn&myndir</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Bi?ja um sta?festingu ??ur en samstilltar eru n?jar m?ppur st?rri en</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2826,11 +2913,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Bi?ja um sta?festingu ??ur en samstilltar eru ytri gagnageymslur</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>Setja fjarl?g?ar skr?r ? rusli?</translation>
@@ -2882,11 +2964,6 @@
<translation>Uppf?rslur?s</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>Endu&rr?sa && uppf?ra...</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>Leit&a sj?lfvirkt a? uppf?rslum</translation>
@@ -2907,6 +2984,16 @@
<translation>Lagaleg atri?i</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>Endu&rr?sa && uppf?ra...</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Tilkynningar fr? ?j?ni sem krefjast athugunar.</translation>
@@ -2927,6 +3014,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>st??ug</translation>
@@ -3001,6 +3093,11 @@
<source>Debug archive is created at %1</source>
<translation>Bj? til safnskr? til villuleitar ? %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3161,105 +3258,100 @@
<translation>N?tt skr?arheiti</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Endurnefna skr?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Athuga heimildir fyrir endurnefningu ?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>?? hefur ekki heimild til a? endurnefna ?essa skr?. Biddu h?fund sr?rinnar um
a? endurnefna hana.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>Mist?kst a? s?kja heimildir, me? villunni %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>Skr?arheiti? inniheldur bil ? undan og aftan vi?.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>Skr?arheiti? inniheldur bil ? undan.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>Skr?arheiti? inniheldur bil aftan vi? l?nu.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>Nota ?gilt heiti</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>Skr?arheiti? inniheldur ?leyfilega stafi: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>Ekki t?kst a? endurnefna skr?. Gakktu ?r skugga um a? ?? s?rt tengd/ur vi?
net?j?ninn.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>Get ekki endurnefnt skr? ?ar sem skr? me? sama heiti er ?egar til sta?ar ?
net?j?ninum. Veldu eitthva? anna? heiti.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>Ekki t?kst a? endurnefna sta?v?ra skr?. %1</translation>
</message>
@@ -3382,16 +3474,6 @@
ni?urhals. Uppsetta ?tg?fan er %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Sleppa n?na</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>N? ? uppf?rslu</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>Uppf?rsla mist?kst</translation>
@@ -3416,6 +3498,16 @@
<source>Update manually</source>
<translation>Uppf?ra handvirkt</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Sleppa n?na</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>N? ? uppf?rslu</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3440,6 +3532,23 @@
<translation>Milli?j?nn krefst au?kenningar</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Bandbreidd ni?urhals</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Takmarka vi?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KB?ti/sek</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation type="unfinished"/>
@@ -3462,46 +3571,29 @@
<translation>Nota v??v?rar stillingar</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Bandbreidd ni?urhals</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Engin m?rk</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KB?ti/sek</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Takmarka vi?</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Takmarka vi? 3/4 af ??tla?ri bandbreidd</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Bandbreidd innsendinga</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Takmarka sj?lfvirkt</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Bandbreidd innsendinga</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>V?larheiti fyrir milli?j?n</translation>
@@ -3530,6 +3622,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>Gat ekki athuga? me? n?jar uppf?rslur.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Athuga me? uppf?rslu?j?n ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>N? %1 uppf?rsla tilb?in</translation>
@@ -3560,11 +3662,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>Gat ekki athuga? me? n?jar uppf?rslur.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation type="unfinished"/>
@@ -3575,16 +3672,21 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Athuga me? uppf?rslu?j?n ?</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Sta?a ? uppf?rslum er ??ekkt: athuga?i ekki me? n?jar uppf?rslur.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Engar uppf?rslur tilt?kar. Uppsetningin ??n er af n?justu ger?.</translation>
@@ -3763,11 +3865,6 @@
(%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>?gild sl??</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>T?kst ekki a? tengjast %1 ? %2:<br/>%3</translation>
@@ -3778,6 +3875,16 @@
<translation>F?ll ? t?ma ?egar reynt var a? tengjast vi? %1 ? %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>?gild sl??</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Reyni a? tengjast vi? %1 ? %2 ?</translation>
@@ -3788,11 +3895,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation type="unfinished"/>
@@ -3998,62 +4100,34 @@
<translation>Skr?arheiti sem enda ? punkti eru ekki noth?f ? ?essu skr?akerfi.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Mappa</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Skr?</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>Skr?arheiti? inniheldur a? minnsta kosti einn ?gildan staf</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4063,6 +4137,24 @@
<translation>Skr?arheiti? inniheldur bil aftan vi? l?nu.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Mappa</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Skr?</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4071,6 +4163,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>Skr?arheiti? inniheldur bil ? undan.</translation>
@@ -4162,64 +4264,74 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Ekki leyft, ?v? ?? hefur ekki heimild til a? b?ta undirm?ppum ? ?essa m?ppu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Ekki leyft, ?v? ?? hefur ekki heimild til a? b?ta skr?m ? ?essa m?ppu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>Fjarl?ging ekki leyf?, endurheimt</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation type="unfinished"/>
</message>
@@ -4227,38 +4339,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>Gat ekki eytt skr?nni %1 ?r sta?v?rum gagnagrunni</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>Villa vi? a? uppf?ra l?sig?gn: vegna ?gilds breytingat?ma</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>??ekkt fr?vik</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Villa vi? a? uppf?ra l?sig?gn: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>Skr?in er n?na ? notkun</translation>
</message>
@@ -4276,12 +4388,6 @@
<translation>Ekki var h?gt a? s?kja %1 skr?na ?v? dulritunaruppl?singar vantar.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>Skr?in hefur breyst s??an h?n fannst</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4338,6 +4444,12 @@
<source>The file %1 is currently in use</source>
<translation>Skr?in %1 er n?na ? notkun</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>Skr?in hefur breyst s??an h?n fannst</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4355,39 +4467,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>t?kst ekki a? ey?a skr?nni %1, villa: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>Get ekki b?i? til m?ppuna %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>??ekkt fr?vik</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Villa vi? a? uppf?ra l?sig?gn: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>Skr?in %1 er n?na ? notkun</translation>
</message>
@@ -4400,14 +4512,14 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4415,49 +4527,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Villa vi? a? uppf?ra l?sig?gn: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>Skr?in %1 er n?na ? notkun</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Mist?kst a? endurnefna skr?</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4514,39 +4626,39 @@
<translation>Gat ekki endurnefnt skr?na ?$? ? ?$%2?</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Villa vi? a? uppf?ra l?sig?gn: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>Skr?in %1 er n?na ? notkun</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>F?kk rangan HTTP-k??a fr? ?j?ni. ?tti von ? 201, en f?kk "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>Gat ekki fengi? skr?na %1 ?r sta?v?rum gagnagrunni</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Villa vi? ritun l?sigagna ? gagnagrunninn</translation>
</message>
@@ -4554,22 +4666,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>Gat ekki sent inn skr?na %1 ?ar sem ?nnur skr? me? sama heiti en mismunandi h?-/l?gst?fum er ?egar til sta?ar</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>Innsending ? %1 fer fram ?r kv?tanum fyrir m?ppuna</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4577,11 +4678,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Sta?v?ru skr?nni var breytt vi? samstillingu. Henni ver?ur haldi? ?fram.</translation>
@@ -4611,6 +4707,22 @@
<source>The file %1 is currently in use</source>
<translation>Skr?in %1 er n?na ? notkun</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>Innsending ? %1 fer fram ?r kv?tanum fyrir m?ppuna</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4859,6 +4971,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Deila ? samhengisvalmynd</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>?g deildi einhverju me? ??r</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Valkostir sameigna</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Senda einkatengil me? t?lvup?sti ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Afrita einkatengil ? klippispjald</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>Mist?kst a? dulrita m?ppuna ? "%1"</translation>
@@ -4893,43 +5031,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Deila ? samhengisvalmynd</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Veldu n?ja sta?setningu ?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>?g deildi einhverju me? ??r</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Valkostir sameigna</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Athafnir</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Afrita einkatengil ? klippispjald</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Senda einkatengil me? t?lvup?sti ?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>Yfirgefa ?essa sameign</translation>
@@ -4945,11 +5057,6 @@
<translation>Endurdeiling ?essarar m?ppu er ekki leyf?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Afrita innri tengil</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>Dulrita</translation>
@@ -4976,12 +5083,6 @@
<translation><numerusform>Rennur ?t eftir %1 m?n?tu</numerusform><numerusform>Rennur ?t eftir %1 m?n?tur</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Opna ? vafra</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Leysa ?rekstur ?</translation>
@@ -5011,6 +5112,17 @@
<source>Delete</source>
<translation>Ey?a</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Afrita innri tengil</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Opna ? vafra</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5112,13 +5224,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>?essi tenging er EKKI ?rugg ?v? h?n er ekki dulritu?.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>?tg?fa vef?j?ns: %1</translation>
@@ -5138,6 +5243,13 @@
<source>The connection is not secure</source>
<translation>Tengingin er ekki ?rugg</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>?essi tenging er EKKI ?rugg ?v? h?n er ekki dulritu?.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5230,6 +5342,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Einungis %1 eru tilt?k, ?arf a.m.k. %2 til a? r?sa</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>Mist?kst a? opna e?a b?a til atvikaskr?na. Gakktu ?r skugga um a? ?? hafir
+les- og skrifheimildir ? sta?v?ru samstillingarm?ppunni ? t?lvunni.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>?a? er ekki n?gilegt laust pl?ss ? ?j?ninum fyrir sumar innsendingar.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>?leystur ?rekstur.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>Gat ekki uppf?rt skr?: %1</translation>
@@ -5250,23 +5389,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>?leystur ?rekstur.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Einungis %1 eru tilt?k, ?arf a.m.k. %2 til a? r?sa</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>Mist?kst a? opna e?a b?a til atvikaskr?na. Gakktu ?r skugga um a? ?? hafir
-les- og skrifheimildir ? sta?v?ru samstillingarm?ppunni ? t?lvunni.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
@@ -5286,16 +5408,6 @@
<source>Cannot open the sync journal</source>
<translation>Tekst ekki a? opna atvikaskr? samstillingar</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>?a? er ekki n?gilegt laust pl?ss ? ?j?ninum fyrir sumar innsendingar.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5306,7 +5418,7 @@
<translation>?nettengt</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5691,11 +5803,6 @@
<source>Less than a minute</source>
<translation>Minna en m?n?tu</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5703,20 +5810,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5731,6 +5828,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5873,6 +5985,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Skr??u ?ig inn</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>?a? eru engar samstillingarm?ppur stilltar.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Aftengdist %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>?studd ?tg?fa vef?j?ns</translation>
@@ -5893,31 +6020,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Aftengdist %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Aftengdist ? notendareikningum:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>A?gangur %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Skr??u ?ig inn</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Samstilling a?gangs er ?virk</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5939,11 +6041,6 @@
<translation>macOS VFS fyrir %1: Vandam?l kom upp.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>?a? eru engar samstillingarm?ppur stilltar.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Athuga me? breytingar ? fjartengdri "%1"</translation>
@@ -5954,6 +6051,21 @@
<translation>Athuga me? breytingar ? sta?v?rri "%1"</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Aftengdist ? notendareikningum:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>A?gangur %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Samstilling a?gangs er ?virk</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5962,11 +6074,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Sta?v?r mappa</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Notandanafn</translation>
@@ -6002,22 +6109,11 @@
<translation>Spyrja ??ur en samstilltar eru m?ppur st?rri en</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Spyrja ??ur en samstilltar eru ytri gagnageymslur</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Veldu ?a? sem ? a? samstilla</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Halda sta?v?rum g?gnum</translation>
@@ -6032,6 +6128,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Ey?a sta?v?rri m?ppu og r?sa hreina samstillingu</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Veldu ?a? sem ? a? samstilla</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Sta?v?r mappa</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6072,6 +6184,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>? framt??inni</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%nklst</numerusform><numerusform>%nklst</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1m</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>n?na</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Fyrir nokkru s??an</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6112,57 +6269,12 @@
<source>Synced %1</source>
<translation>Samstillti %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>? framt??inni</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%nklst</numerusform><numerusform>%nklst</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>n?na</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1m</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Fyrir nokkru s??an</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6410,6 +6522,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Opna sta?v?ra m?ppu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Tengt</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>Aftengt</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>Opna sta?v?ra m?ppu "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>Opna h?pm?ppu "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>Opna %1 ? skr?astj?ra</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6599,16 +6754,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6623,6 +6768,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6856,16 +7011,16 @@
<translation>Villa kom upp vi? uppsetningu</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Undirb? samstillingu</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>St??va samstillingu</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Undirb? samstillingu</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Samstilling er ? bi?</translation>
@@ -6928,4 +7083,17 @@
<translation>Losa sta?v?rt geymslupl?ss</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>Virkja hra?a samstillingu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_it.ts nextcloud-desktop-3.16.6/translations/client_it.ts
--- nextcloud-desktop-3.16.4/translations/client_it.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_it.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>Abilita la sincronizzazione veloce</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>La sincronizzazione veloce sincronizzer? cambiamenti solo sui file e cartelle che sono stati esplorati. Questo migliorarer? sensibilmente la responsivit?, specie al primo avvio coi file virtuali. Per contro, causer? lo scaricamento ripetuto di file spostati verso una cartella inesplorata.</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>Abilita i file virtuali</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation>Consenti l'eliminazione degli elementi nel Cestino</translation>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -558,7 +550,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Importazione obsoleta</translation>
</message>
@@ -573,7 +565,7 @@
<translation>Salta</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>Importazione account fallita da una configurazione di client obsoleto.</translation>
</message>
@@ -581,33 +573,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Spazio di archiviazione: ...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Le cartelle non marcate saranno <b>rimosse</b> dal file system locale e non saranno sincronizzate pi? con questo computer</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Annulla</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Applica</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Connesso a <server> come <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Sincronizza tutto</translation>
@@ -638,6 +608,33 @@
<translation>Impostazioni di connessione</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Applica</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Spazio di archiviazione: ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Annulla</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Connesso a <server> come <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Nessun account configurato.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>Cifratura End-to-End con file virtuali</translation>
@@ -672,9 +669,9 @@
<b>Questo processo ? irreversibile. Vuoi davvero procedere?</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Nessun account configurato.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation>Dimentica configurazione della crittografia</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -687,6 +684,11 @@
<translation>Visualizza mnemonico</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation>La crittografia ? impostata. Ricordati di <b>Crittografare</b> una cartella per crittografare end-to-end tutti i nuovi file aggiunti ad essa.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>La cifratura end-to-end ? stata attivata per questo account</translation>
@@ -712,6 +714,13 @@
<translation>La cartella ha un errore di sincronizzazione. La cifratura di questa cartella sar? possibile dopo la sincronizzazione</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation>Non puoi crittografare questa cartella perch? la crittografia end-to-end non ? ancora configurata su questo dispositivo.
+Vuoi farlo ora?</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -736,12 +745,6 @@
<translation>Impossibile crittografare la cartella perch? non esiste pi?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Apri cartella</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Cifra</translation>
@@ -780,16 +783,6 @@
<translation>Riavvia sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Riprendi la sincronizzazione</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Sospendi la sincronizzazione</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Rimuovi connessione di sincronizzazione cartelle</translation>
@@ -815,21 +808,11 @@
<translation>Creazione della cartella non riuscita</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Impossibile creare la cartella locale <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Conferma rimozione connessione di sincronizzazione cartelle</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Vuoi davvero fermare la sincronizzazione della cartella <i>%1</i>?</p><p><b>Nota:</b> ci? <b>non</b> eliminer? alcun file.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Rimuovi connessione di sincronizzazione cartelle</translation>
@@ -863,24 +846,24 @@
<translation>Codice mnemonico per cifratura end-to-end</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>Per proteggere la tua identit? crittografica, la cifriamo con un codice mnemonico di 12 parole di dizionario. Annotale e tienile al sicuro. Saranno necessarie per aggiungere altri dispositivi al tuo account (come il tuo smartphone o il portatile).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation>Per proteggere la tua Identit? Crittografica, la criptiamo con un codice mnemonico di 12 parole del dizionario. Annotalo e conservalo in un luogo sicuro. Ti servir? per configurare la sincronizzazione delle cartelle crittografate sugli altri tuoi dispositivi.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>Disattiva la cifratura end-to-end</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation>Dimentica la crittografia end-to-end su questo dispositivo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>Disattivare la cifratura end-to-end per %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation>Vuoi dimenticare le impostazioni di crittografia end-to-end per %1 su questo dispositivo?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>Rimuovendo la crittografia end-to-end si rimuoveranno anche i file locali sincronizzati che risultano criptati.<br>I file criptati rimarranno comunque nel server.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation>Dimenticare la crittografia end-to-end rimuover? i dati sensibili e tutti i file crittografati da questo dispositivo.<br>Tuttavia, i file crittografati rimarranno sul server e su tutti gli altri dispositivi, se configurati.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -893,34 +876,44 @@
<translation>L'operazione di sincronizzazione ? in corso.<br/>Vuoi terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) di %2 in uso. Alcune cartelle, incluse quelle montate in rete o le cartelle condivise, potrebbero avere limiti diversi.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 in uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 di %2 in uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>Migrare il certificato a uno nuovo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Non ci sono informazioni disponibili sull'utilizzo dello spazio di archiviazione.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>Ci sono cartelle che sono cresciute di spazio superando %1MB: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 in uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation>La crittografia end-to-end ? stata inizializzata su questo account con un altro dispositivo. <br>Inserisci il codice mnemonico univoco per sincronizzare le cartelle crittografate anche su questo dispositivo.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 come %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>La crittografia end-to-end ? abilitata su questo account con un altro dispositivo.<br>Pu? essere abilitata su questo dispositivo inserendo il tuo codice mnemonico.<br>Questo abiliter? la sincronizzazione delle cartelle criptate esistenti.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>La versione %1 del server non ? supportata! Continua a tuo rischio.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation>Questo account supporta la crittografia end-to-end, ma ? necessario prima configurarla.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Configura la cifratura</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Questo account supporta la cifratura End-To-End</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -938,79 +931,125 @@
<translation>Il Server %1 ? attualmente in manutenzione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>Il server %1 ? sotto redirezione o la connessione ? tramite captive portal.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Disconnesso da %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Connessione a %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Ci sono nuove cartelle che non sono state sincronizzate poich? sono troppo grandi:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>Connessione non riuscita a %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Ci sono nuove cartelle che non sono state sincronizzate poich? sono archiviazioni esterne:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Errore di configurazione del server: %1 in %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Ci sono nuove cartelle che non sono state sincronizzate poich? sono troppo grandi o archiviazioni esterne:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>? necessario accettare i termini di servizio su %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Apri cartella</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Nessuna connessione di %1 configurata.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Riprendi la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>Migrare il certificato a uno nuovo</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Sospendi la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Ci sono nuove cartelle che non sono state sincronizzate poich? sono troppo grandi:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Impossibile creare la cartella locale <i>%1</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Ci sono nuove cartelle che non sono state sincronizzate poich? sono archiviazioni esterne:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Vuoi davvero fermare la sincronizzazione della cartella <i>%1</i>?</p><p><b>Nota:</b> ci? <b>non</b> eliminer? alcun file.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Ci sono nuove cartelle che non sono state sincronizzate poich? sono troppo grandi o archiviazioni esterne:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>Per proteggere la tua identit? crittografica, la cifriamo con un codice mnemonico di 12 parole di dizionario. Annotale e tienile al sicuro. Saranno necessarie per aggiungere altri dispositivi al tuo account (come il tuo smartphone o il portatile).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>Ci sono cartelle che sono cresciute di spazio superando %1MB: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>Disattiva la cifratura end-to-end</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>La crittografia end-to-end ? abilitata su questo account con un altro dispositivo.<br>Pu? essere abilitata su questo dispositivo inserendo il tuo codice mnemonico.<br>Questo abiliter? la sincronizzazione delle cartelle criptate esistenti.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>Disattivare la cifratura end-to-end per %1?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Questo account supporta la cifratura End-To-End</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>Rimuovendo la crittografia end-to-end si rimuoveranno anche i file locali sincronizzati che risultano criptati.<br>I file criptati rimarranno comunque nel server.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Configura la cifratura</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) di %2 in uso. Alcune cartelle, incluse quelle montate in rete o le cartelle condivise, potrebbero avere limiti diversi.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 di %2 in uso</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Non ci sono informazioni disponibili sull'utilizzo dello spazio di archiviazione.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 come %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>La versione %1 del server non ? supportata! Continua a tuo rischio.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>Il server %1 ? sotto redirezione o la connessione ? tramite captive portal.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Connessione a %1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>Connessione non riuscita a %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Errore di configurazione del server: %1 in %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>? necessario accettare i termini di servizio su %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Nessuna connessione di %1 configurata.</translation>
</message>
</context>
<context>
@@ -1125,11 +1164,6 @@
<translation>Certificato e chiave (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Sfoglia...</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Password del certificato:</translation>
@@ -1140,6 +1174,11 @@
<translation>Si consiglia vivamente un bundle pkcs12 cifrato poich? una copia sar? archiviata nel file di configurazione.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Sfoglia...</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Seleziona un certificato</translation>
@@ -1190,34 +1229,34 @@
<translation>Continua</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 account</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 account</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 cartelle</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 cartella</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Importazione obsoleta</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1225,12 +1264,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Errore accedendo al file di configurazione</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>Si ? verificato un errore durante l'accesso al file di configurazione su %1. Assicurati che il file sia accessibile dal tuo account di sistema.</translation>
</message>
@@ -1272,6 +1311,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation>Il file ? cambiato dopo la scoperta</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation>Impossibile eliminare il record del file %1 dal DB locale</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation>Il file %1non pu? essere scaricato perch? non ? virtuale!</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation>Impossibile ottenere il file %1 dal DB locale</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation>Impossibile scaricare il file %1 perch? mancano le informazioni di crittografia.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation>Errore durante l'aggiornamento dei metadati: %1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation>Il file %1 ? attualmente in uso</translation>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1279,6 +1357,11 @@
<translation>Il file %1 non pu? essere caricato poich? esiste un altro file con lo stesso nome, ma con differenze tra maiuscole e minuscole</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation>Il file contiene spazi iniziali o finali e non pu? essere rinominato</translation>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Il file %1 ha un orario di modifica non valido. Non inviarlo sul server.</translation>
@@ -1483,7 +1566,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Errore durante la scrittura dei metadati nel database</translation>
</message>
@@ -1613,21 +1696,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Vuoi eliminare la cartella <i>%1</i> e il suo contenuto definitivamente?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Vuoi eliminare il file <i>%1</i> definitivamente?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Conferma l'eliminazione</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1643,30 +1711,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Nessun account Nextcloud configurato</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Vuoi eliminare la cartella <i>%1</i> e il suo contenuto definitivamente?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Errore di autenticazione: nome utente o password errati.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Vuoi eliminare il file <i>%1</i> definitivamente?</translation>
</message>
<message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Conferma l'eliminazione</translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
+ <message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Scadenza</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Le credenziali fornite non sono corrette</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>Il server configurato per questo client ? troppo datato</translation>
@@ -1676,16 +1744,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Aggiorna all'ultima versione del server e riavvia il client.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Errore di autenticazione: nome utente o password errati.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Nessun account Nextcloud configurato</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Le credenziali fornite non sono corrette</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Errore nell'annullamento della cancellazione di un file</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>Errore nell'annullamento della cancellazione di %1</translation>
</message>
@@ -1693,19 +1776,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Errore del server: la risposta PROPFIND non ? in formato XML!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>Eerrore nell'impostazione dei metadati di crittografia!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>Errore di configurazione dei metadati crittografati: la firma iniziale del server ? vuota.</translation>
</message>
@@ -1713,27 +1796,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Errore durante l'apertura della cartella %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Cartella non accessibile sul client, permesso negato</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Cartella non trovata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>La codifica del nome del file non ? valida</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Errore durante la lettura della cartella %1</translation>
</message>
@@ -1973,11 +2056,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>L'URL di polling non inizia con HTTPS sebbene l'URL di accesso fosse iniziato con HTTPS. L'accesso non sar? possibile perch? pu? essere un rischio di sicurezza. Contatta il tuo amministratore.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>L'URL del server ritornato non inizia con HTTPS sebbene l'URL di accesso fosse iniziato con HTTPS. L'accesso non sar? possibile perch? pu? essere un rischio di sicurezza. Contatta il tuo amministratore.</translation>
@@ -1989,28 +2067,33 @@
<translation>Errore restituito dal server: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>L'URL di polling non inizia con HTTPS sebbene l'URL di accesso fosse iniziato con HTTPS. L'accesso non sar? possibile perch? pu? essere un rischio di sicurezza. Contatta il tuo amministratore.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Si ? verificato un errore durante l'accesso al terminatore dei "token": <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Impossibile elaborare il JSON restituito dal server: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>La risposta dal server non conteneva tutti i campi attesi</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation>La risposta del server non conteneva tutti i campi previsti: <br><em>%1</em></translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Impossibile elaborare il JSON restituito dal server: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2053,6 +2136,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ? stato rimosso.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ? stato aggiornato.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 ? stato rinominato in %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 ? stato spostato in %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation><numerusform>%1 e %n altro file ? stato rimosso.</numerusform><numerusform>%1 e %n altri file sono stati rimossi.</numerusform><numerusform>%1 e %n altri file sono stati rimossi.</numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>Si prega di scegliere una posizione diversa. La cartella %1 non esiste.</translation>
@@ -2068,17 +2179,6 @@
<translation>Si prega di scegliere una posizione diversa.. %1 non ? una cartella leggibile.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 e %n altro file sono stati rimossi.</numerusform><numerusform>%1 e %n altri file sono stati rimossi.</numerusform><numerusform>%1 e %n altri file sono stati rimossi.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ? stato rimosso.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 e %n altro file sono stati aggiunti.</numerusform><numerusform>%1 e %n altri file sono stati aggiunti.</numerusform><numerusform>%1 e %n altri file sono stati aggiunti.</numerusform></translation>
@@ -2094,33 +2194,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 e %n altro file sono stati aggiornati.</numerusform><numerusform>%1 e %n altri file sono stati aggiornati.</numerusform><numerusform>%1 e %n altri file sono stati aggiornati.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ? stato aggiornato.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ? stato rinominato in %2 e %n altro file sono stati rinominati.</numerusform><numerusform>%1 ? stato rinominato in %2 e %n altri file sono stati rinominati.</numerusform><numerusform>%1 ? stato rinominato in %2 e %n altri file sono stati rinominati.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 ? stato rinominato in %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 ? stato spostato in %2 e %n altro file sono stati spostati.</numerusform><numerusform>%1 ? stato spostato in %2 e %n altri file sono stati spostati.</numerusform><numerusform>%1 ? stato spostato in %2 e %n altri file sono stati spostati.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 ? stato spostato in %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2157,19 +2240,19 @@
<translation>Sincronizza attivit?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Impossibile leggere il file di esclusione di sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una nuova cartella pi? grande di %1 MB ? stata aggiunta: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una nuova cartella da un'archiviazione esterna ? stata aggiunta.
@@ -2177,49 +2260,49 @@
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Vai nelle impostazioni e selezionala se vuoi scaricarla.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>Una cartella ha superato il limite di dimensione impostato per la cartella di %1MB: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>Continua a sincronizzare</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>Ferma la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>La cartella %1 ha superato il limite di dimensione impostato di %2MB.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>Vuoi interrompere la sincronizzazione di questa cartella?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>La cartella %1 ? stata creata, ma ? stata esclusa dalla sincronizzazione in precedenza. I dati al suo interno non saranno sincronizzati.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Il file %1 ? stato creato, ma ? stato escluso dalla sincronizzazione in precedenza. Non sar? sincronizzato.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2232,12 +2315,12 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>Download del file virtuale fallito con codice "%1", stato "%2" e messaggio di errore "%3"</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2246,7 +2329,7 @@
In alternativa, puoi ripristinare tutti i file eliminati caricandoli dalla cartella '%1' sul server.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2255,22 +2338,22 @@
In alternativa, ? possibile ripristinare tutti i file eliminati scaricandoli dal server.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>Rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>Procedi con la cancellazione</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>Ripristina i file sul server</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>Ripristina i file dal server</translation>
</message>
@@ -2311,11 +2394,6 @@
<translation>Impossibile ripristinare lo stato della cartella</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>? stato trovato un vecchio registro di sincronizzazione "%1", ma non pu? essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(copia di sicurezza)</translation>
@@ -2326,6 +2404,11 @@
<translation>(copia di sicurezza %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>? stato trovato un vecchio registro di sincronizzazione "%1", ma non pu? essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Stato non definito.</translation>
@@ -2396,16 +2479,6 @@
<translation>Richiesta di sincronizzazione annullata.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>La sincronizzazione ? sospesa.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation> %1 (La sincronizzazione ? sospesa)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>Seleziona una posizione diversa. La cartella selezionata non ? valida.</translation>
@@ -2456,6 +2529,16 @@
Per utenti avanzati: questo problema potrebbe essere correlato a pi? file di database di sincronizzazione trovati in una cartella.
Si prega di controllare %1 per i file .sync_*.db obsoleti e inutilizzati e rimuoverli.</translation>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>La sincronizzazione ? sospesa.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation> %1 (La sincronizzazione ? sospesa)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2499,16 +2582,6 @@
<translation>Errore durante il caricamento dell'elenco delle cartelle dal server.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Recupero dell'elenco delle cartelle dal server...</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Ci sono conflitti irrisolti. Fai clic per ulteriori dettagli. </translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>Il supporto dei file virtuali ? abilitato.</translation>
@@ -2550,16 +2623,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>Download %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>File %1 di %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Ci sono conflitti irrisolti. Fai clic per ulteriori dettagli. </translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>Download %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Recupero dell'elenco delle cartelle dal server...</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2606,21 +2694,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 di %2, file %3 di %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>File %1 di %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>In attesa di %n altra cartella...</numerusform><numerusform>In attesa di %n altre cartelle...</numerusform><numerusform>In attesa di %n altre cartelle...</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>Pronto per iniziare la sincronizzazione</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>In attesa di %n altra cartella...</numerusform><numerusform>In attesa di %n altre cartelle...</numerusform><numerusform>In attesa di %n altre cartelle...</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2780,11 +2863,6 @@
<translation>Impostazioni generali</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>Esegui a&ll'avvio del sistema</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>Mostra notifiche di chiamata</translation>
@@ -2795,11 +2873,6 @@
<translation>Per il vassoio di sistema</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Usa icone &monocromatiche</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>Mostra notifiche chat</translation>
@@ -2815,17 +2888,32 @@
<translation>Avanzate</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Chiedi conferma prima di sincronizzare cartelle pi? grandi di</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Chiedi conferma prima di sincronizzare storage esterni</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>Esegui a&ll'avvio del sistema</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Usa icone &monocromatiche</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Chiedi conferma prima di sincronizzare cartelle pi? grandi di</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>Notifica quando le cartelle sincronizzate crescono e superano il limite specificato</translation>
@@ -2836,11 +2924,6 @@
<translation>Disabilita automaticamente la sincronizzazione delle cartelle che superano il limite</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Chiedi conferma prima di sincronizzare storage esterni</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>Sposta nel cestino i file eliminati</translation>
@@ -2892,11 +2975,6 @@
<translation>Canale di aggiornamento</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Riavvia e aggiorna</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>Verific&a automaticamente la presenza di aggiornamenti.</translation>
@@ -2917,6 +2995,16 @@
<translation>Note legali</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation>Ripristino &Predefinito</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Riavvia e aggiorna</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Notifiche del server che richiedono attenzione.</translation>
@@ -2937,6 +3025,11 @@
<translation>Non puoi disabilitare l'avvio automatico poich? ? abilitato l'avvio automatico a livello di sistema.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation>Ripristinare a &%1</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>stabile</translation>
@@ -3018,6 +3111,11 @@
<source>Debug archive is created at %1</source>
<translation>L'archivio di debug ? stato creato in %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation>Redigi le informazioni considerate sensibili prima di condividerle! Archivio di debug creato al %1</translation>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3182,102 +3280,97 @@
<translation>Nuovo nome del file</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Rinomina file</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>Il file "%1" non ? stato sincronizzato perch? il nome contiene caratteri non consentiti in questo sistema.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>I seguenti caratteri non sono consentiti nel sistema: * " | & ? , ; : \ / ~ < > spazi iniziali/finali</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation>I seguenti caratteri non sono consentiti sul sistema: \ / : ? * " < > | spazi iniziali/finali</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>Il file "%1" non ? stato possibile sincronizzare perch? il nome contiene caratteri non consentiti sul server.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>I seguenti caratteri non sono consentiti: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>I seguenti nomi base non sono consentiti: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>I seguenti nomi di file non sono consentiti: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>Le seguenti estensioni di file non sono consentite: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Controllo permessi per rinominare ?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>Non hai il permesso di rinominare questo file. Chiedi all'autore del file di rinominarlo.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>Recupero dei permessi fallito con errore %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>Il nome del file contiene spazi all'inizio e alla fine.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>Il nome del file contiene spazi all'inizio.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>Il nome del file contiene spazi alla fine.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>Usa nome non valido</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>Il nome del file contiene caratteri non consentiti: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>Impossibile rinominare il file. Assicurati di essere connesso al server.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>Impossibile rinominare il file perch? ne esiste gi? uno con lo stesso nome sul server. Scegli un altro nome.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>Impossibile rimuovere il file locale. %1</translation>
</message>
@@ -3399,16 +3492,6 @@
<translation><p>Una nuova versione del client %1 ? disponibile.</p><p><b>%2</b> ? disponibile per lo scaricamento. La versione installata ? %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Salta questa volta</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Ottieni l'aggiornamento</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>Aggiornamento non riuscito</translation>
@@ -3433,6 +3516,16 @@
<source>Update manually</source>
<translation>Aggiorna manualmente</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Salta questa volta</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Ottieni l'aggiornamento</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3457,6 +3550,23 @@
<translation>Il server proxy richiede l'autenticazione</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Ampiezza di banda in entrata</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Limita a</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KByte/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>Nota: le impostazioni proxy non hanno effetto per gli account su localhost</translation>
@@ -3479,46 +3589,29 @@
<translation>Usa le impostazioni globali</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Ampiezza di banda in entrata</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Nessun limite</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KByte/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Limita a</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Limita a 3/4 della banda stimata</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Ampiezza di banda in uscita</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Limita automaticamente</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Ampiezza di banda in uscita</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Nome host del server proxy</translation>
@@ -3547,6 +3640,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>Impossibile verificare la presenza di nuovi aggiornamenti.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Controllo server degli aggiornamenti...</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>Nuovo aggiornamento di %1 pronto</translation>
@@ -3577,11 +3680,6 @@
<translation>Impossibile scaricare l'aggiornamento. Apri %1 per scaricare l'aggiornamento manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>Impossibile verificare la presenza di nuovi aggiornamenti.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>Un nuovo %1 ? disponibile. Apri <a href='%2'>%2</a> per scaricare l'aggiornamento.</translation>
@@ -3592,16 +3690,21 @@
<translation>Il nuovo %1 ? disponibile. Apri %2 per scaricare l'aggiornamento.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Controllo server degli aggiornamenti...</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Lo stato di aggiornamento ? sconosciuto. Non ? possibile verificare la presenza di nuovi aggiornamenti.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation>Stai utilizzando il canale di aggiornamento %1. La tua installazione ? alla versione pi? recente.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation>Nessun aggiornamento disponibile. La tua installazione ? alla versione pi? recente.</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Non ci sono aggiornamenti disponibili. La tua installazione ? aggiornata all'ultima versione.</translation>
@@ -3777,11 +3880,6 @@
<translation><font color="green">Connesso correttamente a %1: %2 versione %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>URL non valido</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Connessione a %1 su %2:<br/>%3</translation>
@@ -3792,6 +3890,16 @@
<translation>Tempo scaduto durante il tentativo di connessione a %1 su %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Accesso negato dal server. Per verificare di avere i permessi appropriati, <a href="%1">fai clic qui</a> per accedere al servizio con il tuo browser.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>URL non valido</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Tentativo di connessione a %1 su %2...</translation>
@@ -3802,11 +3910,6 @@
<translation>La richiesta autenticata al server ? stata rediretta a "%1". L'URL ? errato, il server non ? configurato correttamente.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Accesso negato dal server. Per verificare di avere i permessi appropriati, <a href="%1">fai clic qui</a> per accedere al servizio con il tuo browser.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>Ricevuta una risposta non valida a una richiesta WebDAV autenticata</translation>
@@ -4012,62 +4115,34 @@
<translation>I nomi del file che terminano con un punto non sono supportati su questo file system.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Cartella</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>File</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation>Nomi delle cartelle contenenti il ??carattere "%1" non sono supportati su questo file system.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>Il nome %1 che contiene il carattere "%2" non ? supportato su questo file system.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation>Nomi dei file contenenti il ??carattere "%1" non sono supportati su questo file system.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>Il nome %1 contiene almeno un carattere non valido</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation>Il nome della cartella contiene almeno un carattere non valido</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>Il nome %1 ? un nome riservato su questo file system.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>Il nome del file contiene almeno un carattere non valido</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation>Il nome della cartella ? un nome riservato su questo file system.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation>Il nome del file ? un nome riservato su questo file system.</translation>
</message>
@@ -4077,6 +4152,24 @@
<translation>Il nome del file contiene spazi alla fine.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Cartella</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>File</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>Il nome %1 che contiene il carattere "%2" non ? supportato su questo file system.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4085,6 +4178,16 @@
<translation>Non pu? essere rinominato o caricato.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>Il nome %1 contiene almeno un carattere non valido</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>Il nome %1 ? un nome riservato su questo file system.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>Il nome del file contiene spazi all'inizio.</translation>
@@ -4175,64 +4278,74 @@
<translation>Il server non ha restituito alcun %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Impossibile sincronizzare a causa di un orario di modifica non valido</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation>Il caricamento di %1supera %2 dello spazio rimasto nei file personali.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation>Il caricamento di %1supera %2 dello spazio rimasto nella cartella %3.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>Impossibile caricare il file, perch? ? aperto in "%1".</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>Errore nella rilevazione del record del file %1 dal database</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>Spostato su una destinazione non valida, ripristino</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>Impossibile modificare l'elemento crittografato perch? il certificato selezionato non ? valido.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorato in base alla lista nera per la scelta di cosa sincronizzare</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Non consentito perch? non sei autorizzato ad aggiungere sottocartelle a quella cartella</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Non ti ? consentito perch? non hai i permessi per aggiungere file in quella cartella </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Non ti ? permesso caricare questo file perch? hai l'accesso in sola lettura sul server, ripristino</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>Rimozione non consentita, ripristino</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Errore durante la lettura del database</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>Il server ha risposto con un errore durante la lettura della cartella "%1" : %2</translation>
</message>
@@ -4240,38 +4353,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>Impossibile eliminare il file %1 dal DB locale</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>Errore di aggiornamento dei metadati a causa dell'orario di modifica non valido</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>La cartella %1 non pu? essere resa in sola lettura: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>eccezione sconosciuta</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Errore di invio dei metadati: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>Il file ? attualmente in uso</translation>
</message>
@@ -4289,12 +4402,6 @@
<translation>Il file %1 non pu? essere scaricato per la mancanza di informazioni di crittografia.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>Il file ? stato modificato dal suo rilevamento</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4351,6 +4458,12 @@
<source>The file %1 is currently in use</source>
<translation>Il file %1 ? attualmente in uso</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>Il file ? stato modificato dal suo rilevamento</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4368,39 +4481,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>Impossibile eliminare il file %1, errore: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>La cartella %1 non pu? essere creata perch? il suo nome conflitta con quello di un altro file o cartella!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>Impossibile creare la cartella %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>La cartella %1 non pu? essere resa in sola lettura: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>eccezione sconosciuta</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Errore di invio dei metadati: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>Il file %1 ? attualmente in uso</translation>
</message>
@@ -4413,14 +4526,14 @@
<translation>Impossibile rimuovere %1 a causa di un conflitto con un file locale</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation>Errore temporaneo durante la rimozione dell'elemento locale rimosso dal server.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Impossibile eliminare il record del file %1 dal DB locale</translation>
</message>
@@ -4428,49 +4541,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>La cartella %1 non pu? essere rinominata perch? il suo nome conflitta con quello di un altro file o cartella!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>File %1 ? stato scaricato ma ha causato un conflitto nei nomi di file!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>Impossibile ottenere il file %1 dal DB locale</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Errore durante l'impostazione dello stato del PIN</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Errore di invio dei metadati: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>Il file %1 ? attualmente in uso</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>Impossibile propagare la rinomina della cartella nella gerarchia</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Rinominazione file non riuscita</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Impossibile eliminare il record del file %1 dal DB locale</translation>
</message>
@@ -4527,39 +4640,39 @@
<translation>Impossibile rinominare %1 in %2, errore: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Errore di invio dei metadati: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>Il file %1 ? attualmente in uso</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Codice HTTP errato restituito dal server. Atteso 201, ma ricevuto "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>Impossibile ottenere il file %1 dal DB locale</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Impossibile eliminare il record del file %1 dal DB locale</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Errore durante l'impostazione dello stato del PIN</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Errore durante la scrittura dei metadati nel database</translation>
</message>
@@ -4567,22 +4680,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>Caricamento del file cifrato non riuscito.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>Il file %1 non pu? essere caricato poich? esiste un altro file con lo stesso nome, ma con differenze tra maiuscole e minuscole</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>Il caricamento di %1 supera la quota per la cartella</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4590,11 +4692,6 @@
<translation>Il file %1 ha un orario di modifica non valido. Non inviarlo sul server.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>File rimosso (avvio caricamento) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Il file locale ? stato modificato durante la sincronizzazione. Sar? ripristinato.</translation>
@@ -4624,6 +4721,22 @@
<source>The file %1 is currently in use</source>
<translation>Il file %1 ? attualmente in uso</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>Il caricamento di %1 supera la quota per la cartella</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>Caricamento del file cifrato non riuscito.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>File rimosso (avvio caricamento) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4872,6 +4985,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Condivisione da menu contestuale</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Ho condiviso qualcosa con te</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Opzioni di condivisione</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Invia collegamento privato tramite email?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Copia link privato negli appunti</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>Impossibile criptare una cartella su "%1"</translation>
@@ -4906,43 +5045,17 @@
<translation>La seguente cartella ? stata crittografata correttamente: "%1"</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Condivisione da menu contestuale</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Seleziona nuova posizione?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Ho condiviso qualcosa con te</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Opzioni di condivisione</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Attivit?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Copia link privato negli appunti</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Invia collegamento privato tramite email?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>Abbandona questa condivisione</translation>
@@ -4958,11 +5071,6 @@
<translation>La ri-condivisione di questa cartella non ? consentita</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Copia collegamento interno</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>Cifra</translation>
@@ -4989,12 +5097,6 @@
<translation><numerusform>Scade fra %1 minuti</numerusform><numerusform>Scade fra %1 minuti</numerusform><numerusform>Scade fra %1 minuti</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Apri nel browser</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Risolvi conflitto?</translation>
@@ -5024,6 +5126,17 @@
<source>Delete</source>
<translation>Elimina</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Copia collegamento interno</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Apri nel browser</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5125,13 +5238,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Questa connessione NON ? sicura poich? non ? cifrata.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Versione server: %1</translation>
@@ -5151,6 +5257,13 @@
<source>The connection is not secure</source>
<translation>La connessione non ? sicura</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Questa connessione NON ? sicura poich? non ? cifrata.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5243,6 +5356,32 @@
<translation>%1 (saltato a causa di un errore precedente, nuovo tentativo in %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Sono disponibili solo %1, servono almeno %2 per iniziare</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>Impossibile aprire o creare il database locale di sincronizzazione. Assicurati di avere accesso in scrittura alla cartella di sincronizzazione.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Lo spazio su disco ? basso: gli scaricamenti che potrebbero ridurre lo spazio libero sotto %1 saranno saltati.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>Spazio disponibile insufficiente sul server per alcuni caricamenti.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Conflitto non risolto</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>Impossibile aggiornare il file: %1</translation>
@@ -5263,22 +5402,6 @@
<translation>Impossibile impostare il record del file nel DB locale: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Conflitto non risolto</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Sono disponibili solo %1, servono almeno %2 per iniziare</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>Impossibile aprire o creare il database locale di sincronizzazione. Assicurati di avere accesso in scrittura alla cartella di sincronizzazione.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Utilizzo di file virtuali con suffisso, ma il suffisso non ? impostato</translation>
@@ -5298,16 +5421,6 @@
<source>Cannot open the sync journal</source>
<translation>Impossibile aprire il registro di sincronizzazione</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Lo spazio su disco ? basso: gli scaricamenti che potrebbero ridurre lo spazio libero sotto %1 saranno saltati.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>Spazio disponibile insufficiente sul server per alcuni caricamenti.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5318,7 +5431,7 @@
<translation>Non in linea</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>Devi accettare i termini del servizio</translation>
</message>
@@ -5702,11 +5815,6 @@
<source>Less than a minute</source>
<translation>Meno di un minuto</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation><numerusform>%n minuto</numerusform><numerusform>%n minuti</numerusform><numerusform>%n minute(s)</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5714,20 +5822,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation><numerusform>%n ora</numerusform><numerusform>%n ore</numerusform><numerusform>%n hour(s)</numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1 minuto</numerusform><numerusform>%1 minuti</numerusform><numerusform>%1 minuti</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation><numerusform>%n giorno</numerusform><numerusform>%n giorni</numerusform><numerusform>%n giorni</numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1 ora</numerusform><numerusform>%1 ore</numerusform><numerusform>%1 ore</numerusform></translation>
@@ -5742,6 +5840,21 @@
<source>%1 days</source>
<translation><numerusform>%1 giorno</numerusform><numerusform>%1 giorni</numerusform><numerusform>%1 giorni</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation><numerusform>%n minuto</numerusform><numerusform>%n minuti</numerusform><numerusform>%n minute(s)</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n ora</numerusform><numerusform>%n ore</numerusform><numerusform>%n hour(s)</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n giorno</numerusform><numerusform>%n giorni</numerusform><numerusform>%n giorni</numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5884,6 +5997,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Accedi</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>Non ? stata configurata alcuna cartella per la sincronizzazione.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Disconnesso dal %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Versione del server non supportata</translation>
@@ -5904,31 +6032,6 @@
<translation>Il tuo account %1 richiede di accettare i termini di servizio del tuo server. Verrai reindirizzato a %2 per confermare di averlo letto e di accettarlo.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Disconnesso dal %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Disconnesso dagli account:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Account %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Accedi</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>La sincronizzazione dell'account ? disabilitata</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5950,11 +6053,6 @@
<translation>macOS VFS per %1: Si ? verificato un problema.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>Non ? stata configurata alcuna cartella per la sincronizzazione.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Controllo delle modifiche in "%1" remoto</translation>
@@ -5965,6 +6063,21 @@
<translation>Controllo delle modifiche in "%1" locale</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Disconnesso dagli account:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Account %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>La sincronizzazione dell'account ? disabilitata</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5973,11 +6086,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>Carte&lla locale</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Nome utente</translation>
@@ -6013,22 +6121,11 @@
<translation>Chiedi prima di sincronizzare cartelle pi? grandi di</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Chiedi prima di sincronizzare archiviazioni esterne</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Scegli cosa sincronizzare</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Mantieni i dati locali</translation>
@@ -6043,6 +6140,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Elimina la cartella locale e inizia una sincronizzazione pulita</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Scegli cosa sincronizzare</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>Carte&lla locale</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6083,6 +6196,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%ngiorno</numerusform><numerusform>%ngiorni</numerusform><numerusform>%ngiorni</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>nel futuro</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%nora</numerusform><numerusform>%nore</numerusform><numerusform>%nore</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1m</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%nminuto</numerusform><numerusform>%nminuti</numerusform><numerusform>%nminuti</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>adesso</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Tempo fa</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6123,57 +6281,12 @@
<source>Synced %1</source>
<translation>%1 sincronizzato</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%ngiorno</numerusform><numerusform>%ngiorni</numerusform><numerusform>%ngiorni</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>nel futuro</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%nora</numerusform><numerusform>%nore</numerusform><numerusform>%nore</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>adesso</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1m</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%nminuto</numerusform><numerusform>%nminuti</numerusform><numerusform>%nminuti</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Tempo fa</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation>Errore durante l'eliminazione del file</translation>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>I percorsi che iniziano con il carattere '#' non sono supportati in modalit? VFS.</translation>
@@ -6205,7 +6318,7 @@
<message>
<location filename="../src/gui/ResolveConflictsDialog.qml" line="98"/>
<source>All server versions</source>
- <translation>Tutte le versionni del server</translation>
+ <translation>Tutte le versioni del server</translation>
</message>
<message>
<location filename="../src/gui/ResolveConflictsDialog.qml" line="153"/>
@@ -6419,6 +6532,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>Aprire cartelle locali o di gruppo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Apri cartella locale</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Collegato</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>Disconnesso</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>Apri cartella locale "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>Apri cartella di gruppo "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>Apri %1 in esplora file</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>Menu gruppo utenti e cartelle locali</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6608,16 +6764,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6632,6 +6778,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6865,16 +7021,16 @@
<translation>Si ? verificato un errore durante l'installazione</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Preparazione della sincronizzazione</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>Interruzione della sincronizzazione</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Preparazione della sincronizzazione</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>La sincronizzazione ? sospesa</translation>
@@ -6933,4 +7089,17 @@
<translation>Libera spazio locale</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>Abilita la sincronizzazione veloce</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>La sincronizzazione veloce sincronizzer? cambiamenti solo sui file e cartelle che sono stati esplorati. Questo migliorarer? sensibilmente la responsivit?, specie al primo avvio coi file virtuali. Per contro, causer? lo scaricamento ripetuto di file spostati verso una cartella inesplorata.</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_ja.ts nextcloud-desktop-3.16.6/translations/client_ja.ts
--- nextcloud-desktop-3.16.4/translations/client_ja.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_ja.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>??????????</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>?????????????????????????????????????????? ???????????????????????????????? ?????????????????????????????????????????</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>??????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation>?????????????????</translation>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -558,7 +550,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>?????????(?????????)</translation>
</message>
@@ -573,7 +565,7 @@
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>????????????????????????????????</translation>
</message>
@@ -581,33 +573,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>?????????: ...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>????????????????????????????? <b>??</b>????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>?????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>??</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation> <user> ??? <server> ????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>??????</translation>
@@ -638,6 +608,33 @@
<translation>????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>?????????: ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation> <user> ??? <server> ????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>??????????????????????</translation>
@@ -672,9 +669,9 @@
<b>????????????????????????????</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation>???????????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -687,6 +684,11 @@
<translation>?????????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation>???????????????????????????????????????????????????????<b>?????</b>?????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>End-to-End ????????????????????</translation>
@@ -712,6 +714,13 @@
<translation>????????????????????????????????????????????????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation>????????End-to-End ?????????????????????????????????
+???????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -736,12 +745,6 @@
<translation>??????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>????????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>???</translation>
@@ -780,16 +783,6 @@
<translation>??????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>??</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>????????????</translation>
@@ -815,21 +808,11 @@
<translation>???????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>????????? <i>%1</i> ?????????</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>???????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>?????<i>%1</i>?????????????</p><p><b>?:</b> ??????????????????????????</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>????????????</translation>
@@ -863,24 +846,24 @@
<translation>???????????? mnemonic</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>????????????????????12??????? mnemonic ??????????????????12???????????????????????????????????????????????????????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation>???ID?????????12??????????????????????????????????????????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>End-to-End ?????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation>???????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>%1 ? End-to-End ????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation>???????%1?End-to-End ?????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>End-to-End ??????????????????????????????????????<br>??????????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation>?????????????????????????????????????????????????????????<br>???????????????????????????????????????????????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -893,34 +876,44 @@
<translation>???????????<br/>???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%2 ? %1(%3%) ???????????????????????????????????????????????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 ????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%2 ??? %1 ????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>??????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>????????????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>???? %1 MB ???????????????????: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 ????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation>??????????End-to-End ?????????????????????<br>????????????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 ? %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>???????????????? End-to-End ??????????????<br>???? mnemonic ??????????????????????????????<br>???????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>????????? %1 ????????????! ?????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation>????????End-to-End ??????????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>????????E2E???????????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -938,79 +931,125 @@
<translation>???? %1 ???????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>??? %1 ??????????????????????????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>%1 ?????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>%1 ?????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>?????????????????????????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>%1 ?????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>??????????????????????????????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>?????????: %2 ? %1</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>?????????????????????????????????????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>%1??????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>%1 ??????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>??</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>??????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>?????????????????????????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>????????? <i>%1</i> ?????????</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>??????????????????????????????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>?????<i>%1</i>?????????????</p><p><b>?:</b> ??????????????????????????</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>?????????????????????????????????????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>????????????????????12??????? mnemonic ??????????????????12???????????????????????????????????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>???? %1 MB ???????????????????: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>End-to-End ?????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>???????????????? End-to-End ??????????????<br>???? mnemonic ??????????????????????????????<br>???????????????????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>%1 ? End-to-End ????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>????????E2E???????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>End-to-End ??????????????????????????????????????<br>??????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%2 ? %1(%3%) ???????????????????????????????????????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%2 ??? %1 ????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 ? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>????????? %1 ????????????! ?????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>??? %1 ??????????????????????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>%1 ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>%1 ?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>?????????: %2 ? %1</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>%1??????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>%1 ??????????????</translation>
</message>
</context>
<context>
@@ -1125,11 +1164,6 @@
<translation>????? (pkcs12) :</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>?? ...</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>?????????:</translation>
@@ -1140,6 +1174,11 @@
<translation>?????????????????????????pkcs12?????????????????????</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>?? ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>??????</translation>
@@ -1190,34 +1229,34 @@
<translation>???</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 ?????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 ?????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 ????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 ????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>?????????(?????????)</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1225,12 +1264,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>??????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>%1 ?????????????????????????? ???????????????????????????????????</translation>
</message>
@@ -1272,6 +1311,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation>?????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation>????DB?????????? %1 ???????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation>????%1??????????????????!</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation>????DB?????? %1 ???????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation>??????????????%1?????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation>????????????????????: %1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation>???? %1 ????????</translation>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1279,6 +1357,11 @@
<translation>???? %1 ??????????????????????????????????????????</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation>???????????????????????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>???? %1 ??????????????????????????????</translation>
@@ -1483,7 +1566,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>?????????????????????</translation>
</message>
@@ -1613,21 +1696,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>??????<i>%1</i>???????????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>????<i>%1</i>???????????</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>?????</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1643,30 +1711,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Nextcloud ???????????????</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>??????<i>%1</i>???????????????????</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>?????: ??????????????????????</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>????<i>%1</i>???????????</translation>
</message>
<message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>?????</translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
+ <message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>??????</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>??????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>??????????????????????</translation>
@@ -1676,16 +1744,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>??????????????????????????????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>?????: ??????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Nextcloud ???????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>??????????????????</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>%1 ?????????????????</translation>
</message>
@@ -1693,19 +1776,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>???????????????PROPFIND???XML??????????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>??????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>???????????????????????????????????</translation>
</message>
@@ -1713,27 +1796,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>%1 ??????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>?????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>?????????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>%1 ???????????????????????</translation>
</message>
@@ -1973,11 +2056,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>????URL?HTTPS????????????????????URL?HTTPS???????????????????????????????????????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>????URL?HTTPS???????????????????????URL?HTTPS?????????????????????????????????????????????????????</translation>
@@ -1989,28 +2067,33 @@
<translation>????????????????? <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>????URL?HTTPS????????????????????URL?HTTPS???????????????????????????????????????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>"????"?????????????????????????? <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>??????????JSON???????????? <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation>????????????????????????: <br><em>%1</em></translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>??????????JSON???????????? <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2053,6 +2136,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 ???? %2 ?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 ? %2 ????????</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation><numerusform>%1 ? %n ?????????????????</numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>??????????????%1?????????????</translation>
@@ -2068,17 +2179,6 @@
<translation>??????????????%1?????????????????????</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 ???? %n ???????????????</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ?????????</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 ??? %n ???????????????</numerusform></translation>
@@ -2094,33 +2194,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 ???? %n ???????????????</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ?????????</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ? %2 ?????????????? %n ???????????????</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 ???? %2 ?????????</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 ? %2 ???????? %n ??????????????</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 ? %2 ????????</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2157,68 +2240,68 @@
<translation>?????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>%1 MB ?????????????????????: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>???????????????????????
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>???????????????????? %1MB ??????: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>???? %1 ????????????????? %2MB ???????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>?????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>????? %1 ????????????????????????? ??????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>???? %1 ????????????????????????? ???????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2231,12 +2314,12 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>??????????????????? "%1"?????? "%2"????????? "%3" ????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2245,7 +2328,7 @@
????'%1' ??????????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2254,22 +2337,22 @@
????????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>???????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>??????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>??????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>???????????????</translation>
</message>
@@ -2310,11 +2393,6 @@
<translation>?????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>????????? "%1" ????????????????????????????????????????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(??????)</translation>
@@ -2325,6 +2403,11 @@
<translation>(%1???????)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>????????? "%1" ????????????????????????????????????????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>???????</translation>
@@ -2395,16 +2478,6 @@
<translation>?????????????</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (???????)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>?????????????????????????????</translation>
@@ -2454,6 +2527,16 @@
????????????%1????????????????????????????????????
????????????1??????????????????????????????????????????%1????????????.sync_*.db?????????????????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (???????)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2497,16 +2580,6 @@
<translation>?????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>???????????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>?????????????????</translation>
@@ -2548,16 +2621,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>?????? %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>???? %2 ? %1</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>?????? %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>???????????????????</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2604,21 +2692,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 of %2, ????? %3 of %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>???? %2 ? %1</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>?? %n ???????????</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>????????</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>?? %n ???????????</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2779,11 +2862,6 @@
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>??????????(&L)</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>?????????</translation>
@@ -2794,11 +2872,6 @@
<translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>???????????(&M)</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>??????????</translation>
@@ -2814,17 +2887,32 @@
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>??????????????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>??????????(&L)</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>???????????(&M)</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>??????????????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>???????????????????????????????</translation>
@@ -2835,11 +2923,6 @@
<translation>???????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>?????????????????</translation>
@@ -2891,11 +2974,6 @@
<translation>??????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>???????????(&R)</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>???????????????(&A)</translation>
@@ -2916,6 +2994,16 @@
<translation>????</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation>????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>???????????(&R)</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>?????????????????</translation>
@@ -2936,6 +3024,11 @@
<translation>??????????????????????????????????????????</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation>%1?????</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>???</translation>
@@ -3017,6 +3110,11 @@
<source>Debug archive is created at %1</source>
<translation>%1 ?????????????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation>?????????????????????????????%1???????????????</translation>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3179,102 +3277,97 @@
<translation>????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>??????????????????????????????????"%1"????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>???????????????????: * " | & ? , ; : \ / ~ < > ??/???????</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
- <translation type="unfinished"/>
+ <translation>???????????????????: \ / : ? * " < > | ??/???????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>????????????????????????????????"%1"????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>?????????????? %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>???????????????? %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>????????????????? %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>?????????????????? %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>??????????...</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>???????????????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>??? %1 ?????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>?????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>?????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>?????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>???????????????????: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>??????????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>??????????????????????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>???????? %1 ??????????????????</translation>
</message>
@@ -3398,16 +3491,6 @@
<translation><p>%1 ???????????????????????</p><p><b>%2</b> ????????????????????????????? %3 ???<p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>???????</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>?????????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>?????????????</translation>
@@ -3432,6 +3515,16 @@
<source>Update manually</source>
<translation>???????</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>?????????</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3456,6 +3549,23 @@
<translation>??????????????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>?: ?????????????????????????????</translation>
@@ -3478,46 +3588,29 @@
<translation>????????????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>??????????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>???</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>??</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>?????3/4???</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>??????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>??????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>??????????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>?????????????</translation>
@@ -3546,6 +3639,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>??????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>???????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>????????? %1 ?????????</translation>
@@ -3576,11 +3679,6 @@
<translation>???????????????????????????????????????%1 ?????????</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>??????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>??? %1 ??????????????????????????<a href='%2'>%2</a>????????????</translation>
@@ -3591,16 +3689,21 @@
<translation>??? %1 ??????????????????????%2 ?????????</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>???????????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>?????????? ??????????????</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation>%1????????????????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation>???????????????????????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>???????????????????????????????????</translation>
@@ -3776,11 +3879,6 @@
<translation><font color="green">??? %1 ?????????%2 ????? %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>???URL</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>%2 ? %1 ??????:<br/>%3</translation>
@@ -3791,6 +3889,16 @@
<translation>%2 ? %1 ????????????????????</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>?????????????????????????????????????????<a href="%1">???????</a>????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>???URL</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>%2 ? %1 ???????????</translation>
@@ -3801,11 +3909,6 @@
<translation>?????????????? "%1" ?????????????URL????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>?????????????????????????????????????????<a href="%1">???????</a>????????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>????? WebDAV ?????????????????</translation>
@@ -4017,62 +4120,34 @@
<translation>?????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>?????</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>????</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation>????????????? "%1" ????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>?? "%2" ????? %1 ??????????????????????????</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation>???????????? "%1" ????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>?? %1 ??????? 1 ???????????</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation>?????????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>?? %1 ???????????????????????</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>????????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation>?????????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation>????????????????????????????</translation>
</message>
@@ -4082,6 +4157,24 @@
<translation>???????????????????</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>?????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>?? "%2" ????? %1 ??????????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4090,6 +4183,16 @@
<translation>???????????????????</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>?? %1 ??????? 1 ???????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>?? %1 ???????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>?????????????????????</translation>
@@ -4180,64 +4283,74 @@
<translation>?????? no %1 ?????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>?????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation>%1????????????????????????%2????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation>%1?????????????%3??????%2???????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>"%1" ?????????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>???????? %1 ??????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>???????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>???????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>"????????????" ?????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>????????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>?????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>?????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>???????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>???????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>??????????? "%1" ????????????????: %2</translation>
</message>
@@ -4245,38 +4358,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>????DB?????? %1 ???????????</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>??????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>???? %1 ?????????????: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>?????</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>?????????????????????%1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>????????????</translation>
</message>
@@ -4294,12 +4407,6 @@
<translation>???????????????%1?????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>?????????????????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4356,6 +4463,12 @@
<source>The file %1 is currently in use</source>
<translation>???? %1 ????????</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>?????????????????</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4373,39 +4486,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>???? %1 ????????????: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>???? %1 ????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>????? %1 ????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>???? %1 ?????????????: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>?????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>?????????????????????%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>???? %1 ????????</translation>
</message>
@@ -4418,14 +4531,14 @@
<translation>%1 ?????????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation>???????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>????DB?????????? %1 ???????????</translation>
</message>
@@ -4433,49 +4546,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>????????????????????????????????%1???????????!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>???? %1 ??????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>????DB?????? %1 ???????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>???????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>?????????????????????%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>???? %1 ????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>????DB?????????? %1 ???????????</translation>
</message>
@@ -4532,39 +4645,39 @@
<translation>????%1????%2?????????????: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>?????????????????????%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>???? %1 ????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>???HTTP?????????????????201?????"%1 %2"???????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>????DB?????? %1 ???????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>????DB?????????? %1 ???????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>???????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>?????????????????????</translation>
</message>
@@ -4572,22 +4685,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>??????????????????????????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>???? %1 ??????????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>%1 ?????????????????????????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4595,11 +4697,6 @@
<translation>???? %1 ??????????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>??????????????????????%1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>????????????????????????????</translation>
@@ -4629,6 +4726,22 @@
<source>The file %1 is currently in use</source>
<translation>???? %1 ????????</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>%1 ?????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>??????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>??????????????????????%1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4877,6 +4990,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>?????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>???????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>?????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>???????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>???? "%1" ???????????</translation>
@@ -4911,43 +5050,17 @@
<translation>?????????????????: "%1"</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>?????????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>????????...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>???????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>???????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>???????????????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>?????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>???????</translation>
@@ -4963,11 +5076,6 @@
<translation>?????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>?????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>???</translation>
@@ -4994,12 +5102,6 @@
<translation><numerusform>%1 ??????</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>????????</translation>
@@ -5029,6 +5131,17 @@
<source>Delete</source>
<translation>??</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>????????</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5130,13 +5243,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>???????????????????????????
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>???????????%1</translation>
@@ -5156,6 +5262,13 @@
<source>The connection is not secure</source>
<translation>????????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>???????????????????????????
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5248,6 +5361,32 @@
<translation>%1?????????????????%2?????</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>%1 ?????????????????????????? %2 ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>????????????????????????? ?????????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>???????????%1????????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>???????????????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>???????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>????????????????: %1</translation>
@@ -5268,22 +5407,6 @@
<translation>?????????????DB???????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>???????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>%1 ?????????????????????????? %2 ??????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>????????????????????????? ?????????????????????????????</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>?????????????????????????????????????????</translation>
@@ -5303,16 +5426,6 @@
<source>Cannot open the sync journal</source>
<translation>??????????????????</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>???????????%1????????????????????????????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>???????????????????????????????????</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5323,7 +5436,7 @@
<translation>?????</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>????????????????</translation>
</message>
@@ -5707,11 +5820,6 @@
<source>Less than a minute</source>
<translation>1???</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation><numerusform>%n ?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5719,20 +5827,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation><numerusform>%n ??</numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1?</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation><numerusform>%n ?</numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1??</numerusform></translation>
@@ -5747,6 +5845,21 @@
<source>%1 days</source>
<translation><numerusform>%1?</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation><numerusform>%n ?</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n ??</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n ?</numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5889,6 +6002,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>???????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>%1 ?????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>???????????????????</translation>
@@ -5909,31 +6037,6 @@
<translation>????? %1 ????????????????????????%2???????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>%1 ?????????</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>?????????:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>????? %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>???????????</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>??????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5955,11 +6058,6 @@
<translation>macOS VFS for %1: ??????????</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>???? "%1" ???????? </translation>
@@ -5970,6 +6068,21 @@
<translation>???? "%1" ???????? </translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>?????????:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>????? %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>??????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5978,11 +6091,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>?????????(&L)</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>?????</translation>
@@ -6018,22 +6126,11 @@
<translation>??????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>????????????????</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>??????????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>??????????</translation>
@@ -6048,6 +6145,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>???????????????????????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>?????????(&L)</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6088,6 +6201,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%n?</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>??</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%n??</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1?</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%n?</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>?</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>???</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6128,57 +6286,12 @@
<source>Synced %1</source>
<translation>%1 ???????</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%n?</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>??</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%n??</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>?</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1?</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%n?</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>???</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation>?????????</translation>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>'#'??????????VFS???(??????)?????????????</translation>
@@ -6424,6 +6537,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>??????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>???????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>???????? "%1" ???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>???????? "%1" ???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>????????????? %1 ???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>????????????????????</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6613,16 +6769,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6637,6 +6783,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6870,16 +7026,16 @@
<translation>??????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>??????</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>??????????</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>??????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>???????</translation>
@@ -6938,4 +7094,17 @@
<translation>?????????</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>?????????????????????????????????????????? ???????????????????????????????? ?????????????????????????????????????????</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_ko.ts nextcloud-desktop-3.16.6/translations/client_ko.ts
--- nextcloud-desktop-3.16.4/translations/client_ko.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_ko.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>?? ??? ???</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>?? ???? ?? ??? ?? ??? ?? ?? ??? ???? ??????. ?? ?? ???? ?? ?? ? ???? ?? ???? ? ????. ? ?? ???? ?? ??? ???? ??? ????? ???? ?? ?? ?????.</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>?? ?? ???</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -557,7 +549,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>?? ???? ????</translation>
</message>
@@ -572,7 +564,7 @@
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>?? ??? ??????? ??? ??? ? ????.</translation>
</message>
@@ -580,33 +572,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>??? ??: ...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>???? ?? ??? ?? ?? ????? <b>??</b>?? ? ??? ???? ????? ????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>??</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>??</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation><server>? <user>? ??</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>?? ???</translation>
@@ -637,6 +607,33 @@
<translation>?? ??</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>??? ??: ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation><server>? <user>? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>??? ??? ????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>?? ??? ??? ???</translation>
@@ -671,9 +668,9 @@
<b>? ??? ??? ? ????. ?? ????????</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>??? ??? ????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -686,6 +683,11 @@
<translation>??? ??</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>? ??? ??? ???? ????</translation>
@@ -711,6 +713,12 @@
<translation>??? ??? ??? ????. ? ??? ????? ??? ? ? ???? ? ????.</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -734,12 +742,6 @@
<translation>??? ? ?? ???? ?? ?? ??? ??? ? ? ??</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>?? ??</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>???</translation>
@@ -778,16 +780,6 @@
<translation>??? ?? ??</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>??? ??</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>??? ?? ??</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>??? ?? ?? ??</translation>
@@ -813,21 +805,11 @@
<translation>?? ?? ??</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>?? ??? ?? ? ?? <i>%1</i>.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>??? ?? ?? ?? ??</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>?? <i>%1</i>? ???? ??????</p><p><b>??:</b> ?? ??? <b>???? ????.</b></p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>??? ?? ?? ??</translation>
@@ -861,24 +843,24 @@
<translation>??? ??? ???</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>??? ??? ???? ?? 12?? ?? ??? ????? ???? ?? ??????. ? ??? ???? ???? ?????. ?? ??(???? ???? ?)? ??? ??? ?? ?????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>??? ??? ??</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>%1? ??? ???? ?????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>??? ???? ???? ? ??? ?? ???? ???? ?????.<br>???? ???? ??? ???? ???.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -891,34 +873,44 @@
<translation>???? ??????.<br/>?????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%2? %1 (%3%) ?? ?. ???? ?? ?? ?? ??? ??? ?? ???? ?? ??? ?? ? ????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 ???</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%2? %1 ??? </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>?? ?? ??? ??? ??? ??? ????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>??? %1MB?? ? ?? ??? ????: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 ???</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1? %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>? ?? ? ?? ???? ??? ???? ???? ????.<br>???? ???? ? ???? ??? ???? ????? ??? ???? ???? ???? ? ????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>?? ?? %1? ???? ???? ????. ?? ?? ??????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>??? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>? ??? ??? ???? ?????.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -936,79 +928,125 @@
<translation>?? %1? ?? ?? ?? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>%1 ??? ?? ???? ?? ???, ??? ?? ??? ???? ????.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>%1?? ????????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>%1? ?? ?...</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>??? ?? ?? ??? ?? ?? ??? ????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>%1? ??? ? ????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>?? ?????? ????? ?? ??? ????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>?? ?? ??: %2? ?? %1</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>???? ?? ??? ?? ?????? ????? ?? ??? ????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>?? ??</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>%1 ??? ???? ?????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>??? ??</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>??? ?? ??</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>??? ?? ?? ??? ?? ?? ??? ????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>?? ??? ?? ? ?? <i>%1</i>.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>?? ?????? ????? ?? ??? ????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>?? <i>%1</i>? ???? ??????</p><p><b>??:</b> ?? ??? <b>???? ????.</b></p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>???? ?? ??? ?? ?????? ????? ?? ??? ????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>??? ??? ???? ?? 12?? ?? ??? ????? ???? ?? ??????. ? ??? ???? ???? ?????. ?? ??(???? ???? ?)? ??? ??? ?? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>??? %1MB?? ? ?? ??? ????: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>??? ??? ??</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>? ?? ? ?? ???? ??? ???? ???? ????.<br>???? ???? ? ???? ??? ???? ????? ??? ???? ???? ???? ? ????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>%1? ??? ???? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>? ??? ??? ???? ?????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>??? ???? ???? ? ??? ?? ???? ???? ?????.<br>???? ???? ??? ???? ???.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>??? ??</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%2? %1 (%3%) ?? ?. ???? ?? ?? ?? ??? ??? ?? ???? ?? ??? ?? ? ????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%2? %1 ??? </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>?? ?? ??? ??? ??? ??? ????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>?? ?? %1? ???? ???? ????. ?? ?? ??????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>%1 ??? ?? ???? ?? ???, ??? ?? ??? ???? ????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>%1? ?? ?...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>%1? ??? ? ????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>?? ?? ??: %2? ?? %1</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>%1 ??? ???? ?????.</translation>
</message>
</context>
<context>
@@ -1123,11 +1161,6 @@
<translation>??? & ? (pkcs12) :</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>??...</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>??? ?? :</translation>
@@ -1138,6 +1171,11 @@
<translation>??? ?? ??? ??? ????, ???? pkcs12 ??? ??? ?????.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>??...</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>??? ??</translation>
@@ -1188,34 +1226,34 @@
<translation>??</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1? ??</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1? ??</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1? ??</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1? ??</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>??? ????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1223,12 +1261,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>?? ?? ??? ??</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>%1? ?? ??? ????? ?? ??? ??????. ??? ???? ??? ???? ? ??? ??????.</translation>
</message>
@@ -1270,6 +1308,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1277,6 +1354,11 @@
<translation>??% 1? ????? ?? ?? ??? ??? ?? ??? ???? ? ????.</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>?? %1? '?? ??'?? ???? ????. ? ??? ??? ????? ????.</translation>
@@ -1481,7 +1563,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>??????? ?????? ?? ? ??? ??????.</translation>
</message>
@@ -1611,21 +1693,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>???? <i>%1</i> ? ?? ???? ??? ?????????</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>?? <i>%1</i>? ??? ?????????</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>?? ??</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1641,30 +1708,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>??? Nextcloud ??? ??</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>???? <i>%1</i> ? ?? ???? ??? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>?? ??: ??? ?? ?? ??? ???????.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>?? <i>%1</i>? ??? ?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>?? ??</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>?? ??</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>??? ?? ??? ???? ????.</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>? ?????? ?? ??? ??? ?? ???????.</translation>
@@ -1674,16 +1741,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>?? ??? ???? ? ?????? ?? ???????.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>?? ??: ??? ?? ?? ??? ???????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>??? Nextcloud ??? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>??? ?? ??? ???? ????.</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>?? ??? ???? ? ?? ??</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>%1? ??? ???? ? ?? ??</translation>
</message>
@@ -1691,19 +1773,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>?? ??: PROPFIND ??? XML ??? ????!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>???? ????? ?? ??!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>???? ????? ?? ??: ?????? ?? ??? ??????.</translation>
</message>
@@ -1711,27 +1793,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>???? %1? ?? ? ?? ??</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>???? ?? ??, ??? ??</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>????? ?? ? ??: &1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>?? ?? ???? ???? ????.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>???? %1? ?? ? ?? ??</translation>
</message>
@@ -1971,11 +2053,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>HTTPS? ??? ??? URL?? ???? ?? URL? HTTPS? ???? ????. ?? ??? ? ???? ???? ? ????. ????? ??????.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>??? URL? HTTPS? ?????? ??? ?? URL? HTTPS? ???? ????. ?? ??? ? ???? ???? ? ????. ????? ??????.</translation>
@@ -1987,28 +2064,33 @@
<translation>???? ??? ???????: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>HTTPS? ??? ??? URL?? ???? ?? URL? HTTPS? ???? ????. ?? ??? ? ???? ???? ? ????. ????? ??????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>'??' ???? ????? ? ??? ??????: <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>???? ??? JSON? ?? ?? ? ? ????: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>??? ??? ?? ?? ??? ???? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>???? ??? JSON? ?? ?? ? ? ????: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2051,6 +2133,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1? ???????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1? ???? ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1? ??? %2? ???????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1? %2? ???????.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2066,17 +2176,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1? %n ?? ??(?)? ???????.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1? ???????.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1? %n ?? ??(?)? ???????.</numerusform></translation>
@@ -2092,33 +2191,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1? %n ?? ??(?)? ???? ?????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1? ???? ?????.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1? ??? %2? ????? %n ?? ??(?)? ??? ???????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1? ??? %2? ???????.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1? %2? ????? %n ?? ??(?)? ???????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1? %2? ???????.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2155,68 +2237,68 @@
<translation>??? ??</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>??? ?? ??? ?? ? ????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>%1 MB?? ? ??? ???????: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>?? ???? ??? ???????.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>??????? ???? ???? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>??? ??? ?? ??? %1MB? ??????: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>?? ???</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>??? ??</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>%1 ??? ??? ?? ??? %2MB? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>? ??? ???? ????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>%1 ??? ?????? ??? ????? ???????. ? ?? ???? ????? ????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>%1 ??? ?????? ??? ????? ???????. ????? ????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2229,12 +2311,12 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>?? ?? ????? ?????, ??? "%1", ??? "%2", ?? ???? "%3"???.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2243,7 +2325,7 @@
??? '%1' ??? ????? ??? ?? ???? ??? ? ????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2252,22 +2334,22 @@
??? ???? ??? ?????? ??? ?? ???? ??? ? ????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>??? ?? ??????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>?? ??</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>??? ??? ??</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>????? ??? ??</translation>
</message>
@@ -2308,11 +2390,6 @@
<translation>?? ??? ???? ? ????.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>??? ??? ?? "%1"? ???? ?? ? ? ????. ?? ???? ?? ????? ??? ??????.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(??)</translation>
@@ -2323,6 +2400,11 @@
<translation>(?? %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>??? ??? ?? "%1"? ???? ?? ? ? ????. ?? ???? ?? ????? ??? ??????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>???? ?? ?????.</translation>
@@ -2393,16 +2475,6 @@
<translation>??? ??? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>??? ?? ???</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (??? ?? ???)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2449,6 +2521,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>??? ?? ???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (??? ?? ???)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2492,16 +2574,6 @@
<translation>???? ?? ??? ???? ? ??? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>???? ?? ??? ???? ?...</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>???? ?? ??? ????. ??? ??? ??? ??????.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>?? ?? ??? ????????.</translation>
@@ -2543,16 +2615,31 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>???? %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>%2? ?? ? %1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>???? ?? ??? ????. ??? ??? ??? ??????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>???? %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>???? ?? ??? ???? ?...</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2599,21 +2686,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%2 ? %1, %4? ?? ? %3?</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>%2? ?? ? %1?</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>%n ?? ??(?)? ???? ?...</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>???? ????? ?</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>%n ?? ??(?)? ???? ?...</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2774,11 +2856,6 @@
<translation>?? ??</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>??? ?? ? ??</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>?? ?? ??</translation>
@@ -2789,11 +2866,6 @@
<translation>??? ???</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>?? ??? ??</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>?? ?? ??</translation>
@@ -2809,17 +2881,32 @@
<translation>??</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>???? ? ??? ???? ? ??? ??</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>?? ???? ????? ?? ??????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>??? ?? ? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>?? ??? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>???? ? ??? ???? ? ??? ??</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>???? ??? ??? ???? ? ?? ? ??</translation>
@@ -2830,11 +2917,6 @@
<translation>?? ??? ?? ??? ???? ???? ??</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>?? ???? ????? ?? ??????.</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>??? ??? ????? ??</translation>
@@ -2886,11 +2968,6 @@
<translation>???? ??</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>???? ???</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>????? &???? ??</translation>
@@ -2911,6 +2988,16 @@
<translation>?? ??</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>???? ???</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>??? ??? ?? ??</translation>
@@ -2931,6 +3018,11 @@
<translation>??? ?? ?? ??? ????? ???? ?? ??? ????? ? ????.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>???</translation>
@@ -3012,6 +3104,11 @@
<source>Debug archive is created at %1</source>
<translation>??? ????? %1? ???</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3176,102 +3273,97 @@
<translation>? ?? ??</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>?? ?? ???</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>??? ? ????? ???? ?? ??? ???? ???? ?? "%1"? ???? ? ????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>?? ???? ????? ???? ????. * " | & ? , ; : \ / ~ < > ??/?? ??</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>"%1" ??? ??? ???? ???? ?? ??? ???? ?? ???? ? ????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>???? ?? ??: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>???? ?? ?????: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>???? ?? ?? ??: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>???? ?? ???: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>?? ?? ?? ?? ??</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>? ??? ??? ?? ??? ????. ? ??? ????? ??? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>?? %1(?)? ?? ??? ??? ? ??</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>?? ??? ?? ? ?? ??? ????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>?? ??? ?? ??? ????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>?? ??? ?? ??? ????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>??? ?? ??</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>?? ??? ???? ?? ??? ??: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>?? ??? ?? ? ????. ??? ???? ??? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>??? ??? ??? ??? ?? ??? ??? ??? ? ????. ?? ??? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>?? ??? ??? ??? ? ??. %1</translation>
</message>
@@ -3395,16 +3487,6 @@
<translation><p>%1 ?????? ? ??? ??? ? ????.</p><p><b>%2</b>? ???? ? ? ????. ??? ??? %3???.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>??? ????</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>???? ??</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>???? ??</translation>
@@ -3429,6 +3511,16 @@
<source>Update manually</source>
<translation>???? ????</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>??? ????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>???? ??</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3453,6 +3545,23 @@
<translation>??? ??? ??? ?????.</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>???? ???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>??? ??? ????? ??? ??? ????.</translation>
@@ -3475,46 +3584,29 @@
<translation>?? ?? ??</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>???? ???</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>?? ??</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>??</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>?? ???? 3/4?? ??</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>??? ???</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>???? ??</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>??? ???</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>??? ??? ??? ??</translation>
@@ -3543,6 +3635,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>? ????? ??? ? ????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>???? ?? ?? ? ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>? %1 ???? ???</translation>
@@ -3573,11 +3675,6 @@
<translation>????? ????? ? ????. %1?(?) ?? ???? ????? ???? ????.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>? ????? ??? ? ????.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>? %1?(?) ??? ? ????. <a href='%2'>%2</a>?(?) ?? ????? ????????.</translation>
@@ -3588,16 +3685,21 @@
<translation>? %1?(?) ??? ? ????. %2?(?) ?? ????? ????????.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>???? ?? ?? ? ...</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>???? ??? ? ? ????: ? ????? ???? ?????.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>?? ??? ????? ????. ?? ?????.</translation>
@@ -3774,11 +3876,6 @@
<translation><font color="green">%1(?)? ????? ??: %2 ?? %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>??? URL</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>%2?? %1? ??? ??????:<br/>%3</translation>
@@ -3789,6 +3886,16 @@
<translation>%2?? %1? ??? ???? ? ??? ???????.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>???? ???? ???????. ??? ??? ??? ??? ????? <a href="%1">??</a>? ???? ????? ???? ???????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>??? URL</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>%2?? %1? ??? ???? ?...</translation>
@@ -3799,11 +3906,6 @@
<translation>??? ?? ?? ? ??? '%1'? ?????????. URL? ???? ??? ?? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>???? ???? ???????. ??? ??? ??? ??? ????? <a href="%1">??</a>? ???? ????? ???? ???????.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>??? WebDAV ??? ?? ??? ???????.</translation>
@@ -4015,62 +4117,34 @@
<translation>???? ??? ?? ??? ? ?? ????? ???? ????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>??</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>??</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>"%2" ??? ??? %1 ??? ? ?? ????? ???? ????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>%1 ??? ??? ??? ?? ?? ???? ????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>%1 ??? ? ?? ????? ??? ?????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>?? ??? ??? ??? ? ? ?? ??</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4080,6 +4154,24 @@
<translation>?? ?? ?? ??? ????.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>"%2" ??? ??? %1 ??? ? ?? ????? ???? ????.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4088,6 +4180,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>%1 ??? ??? ??? ?? ?? ???? ????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>%1 ??? ? ?? ????? ??? ?????.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>?? ??? ?? ??? ????.</translation>
@@ -4178,64 +4280,74 @@
<translation>??? %1?(?) ???(????) ???</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>???? ?? ?? ???? ?? ???? ? ????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>??? "%1"?? ???? ??? ???? ? ????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>?? ??? %1(?)? ???????? ???? ? ?? ??</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>???? ?? ???? ???, ??</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>"??? ? ?? ??" ?????? ?? ???????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>?? ??? ?? ??? ?? ? ? ?? ??? ?? ??? ???? ????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>?? ??? ??? ?? ? ??? ???? ???? ????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>? ??? ???? ?? ????? ??? ? ? ????. ??</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>??? ???? ??, ??</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>??????? ?? ? ?? ??</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>??? ???? '%1'?(?) ?? ? ??? ???: %2</translation>
</message>
@@ -4243,38 +4355,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>?? DB?? %1 ??? ??? ? ????.</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>???? ?? ?? ???? ?? ????? ???? ??</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>%1 ??? ?? ???? ?? ? ????: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>????? ???? ??: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>??? ?? ?? ????.</translation>
</message>
@@ -4292,12 +4404,6 @@
<translation>??? ??? ??? %1 ??? ???? ? ? ????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>?? ?? ??? ???????.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4354,6 +4460,12 @@
<source>The file %1 is currently in use</source>
<translation>%1 ??? ?? ?? ????.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>?? ?? ??? ???????.</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4371,39 +4483,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>?? %1? ???? ?????, ??: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>?? ?? ? ??? ??? ????? %1 ??? ?? ? ????!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>?? %1? ?? ? ??</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>%1 ??? ?? ???? ?? ? ????: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>????? ?? ??: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>?? %1(?)? ?? ?? ????.</translation>
</message>
@@ -4416,14 +4528,14 @@
<translation>?? ?? ?? ??? ?? %1? ??? ? ????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>?? ???????? ?? ??? %1?(?) ??? ? ??</translation>
</message>
@@ -4431,49 +4543,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>?? ?? ? ??? ??? ????? %1 ??? ??? ?? ? ????!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>%1 ??? ???? ??? ?? ??? ??? ?????!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>?? ???????? ?? %1?(?) ??? ? ??</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>? ?? ?? ??</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>????? ?? ??: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>?? %1(?)? ?? ?? ????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>?? ??? ?? ?? ???? ???? ??</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>?? ??? ??? ?????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>?? ???????? ?? ??? %1?(?) ??? ? ??</translation>
</message>
@@ -4530,39 +4642,39 @@
<translation>?? %1? ??? %2? ??? ?????, ??: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>????? ?? ??: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>?? %1(?)? ?? ?? ????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>???? ??? HTTP ??? ??????. 201? ???? ?? "1 %2"? ?????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>?? ???????? ?? %1?(?) ??? ? ??</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>?? ???????? ?? ??? %1?(?) ??? ? ??</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>? ?? ?? ??</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>??????? ?????? ?? ? ??? ??????.</translation>
</message>
@@ -4570,22 +4682,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>???? ?? ??? ??</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>??? ?? ?? ??? ?? ?? ??? ????? %1 ??? ??? ? ? ????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>%1? ???? ??? ???? ?????.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4593,11 +4694,6 @@
<translation>?? %1? '?? ??'?? ???? ????. ? ??? ??? ????? ????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>?? ??? (??? ??) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>??? ? ?? ??? ???????. ? ?????.</translation>
@@ -4627,6 +4723,22 @@
<source>The file %1 is currently in use</source>
<translation>?? %1(?)? ?? ?? ????.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>%1? ???? ??? ???? ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>???? ?? ??? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>?? ??? (??? ??) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4875,6 +4987,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>???? ?? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>??? ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>?? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>???? ?? ?? ??? ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>????? ?? ?? ?? ??</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>"%1"? ?? ??? ???? ? ??</translation>
@@ -4909,43 +5047,17 @@
<translation>?? ??? ????? ??? ?????: "%1"</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>???? ?? ??</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>? ?? ?? ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>??? ?????.</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>?? ??</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>??</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>????? ?? ?? ?? ??</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>???? ?? ?? ??? ...</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>? ???? ???</translation>
@@ -4961,11 +5073,6 @@
<translation>? ??? ?? ??? ? ????.</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>?? ?? ??</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>???</translation>
@@ -4992,12 +5099,6 @@
<translation><numerusform>%1? ?? ???</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>?????? ??</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>?? ?? ...</translation>
@@ -5027,6 +5128,17 @@
<source>Delete</source>
<translation>??</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>?? ?? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>?????? ??</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5128,13 +5240,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>????? ?? ??? ???? ????.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>?? ??: %1</translation>
@@ -5154,6 +5259,13 @@
<source>The connection is not secure</source>
<translation>??? ???? ????.</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>????? ?? ??? ???? ????.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5246,6 +5358,32 @@
<translation>%1 (?? ??? ?? ?????? %2?? ?? ??)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>%1 ? ??? ? ????. ????? %2 ??? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>?? ??? ??????? ??? ?? ? ????. ??? ??? ?? ?? ??? ??? ??????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>??? ??? ?????. ?? ??? %1 ???? ??? ????? ?? ???.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>?? ???? ?? ??? ?? ??? ??? ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>???? ?? ??</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>??? ????? ? ??: %1</translation>
@@ -5266,22 +5404,6 @@
<translation>?? ???????? ?? ??? %1?(?) ??? ? ??</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>???? ?? ??</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>%1 ? ??? ? ????. ????? %2 ??? ?????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>?? ??? ??????? ??? ?? ? ????. ??? ??? ?? ?? ??? ??? ??????.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>?? ??? ???? ?? ???, ???? ???? ??</translation>
@@ -5301,16 +5423,6 @@
<source>Cannot open the sync journal</source>
<translation>??? ??? ? ? ????.</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>??? ??? ?????. ?? ??? %1 ???? ??? ????? ?? ???.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>?? ???? ?? ??? ?? ??? ??? ?????.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5321,7 +5433,7 @@
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5705,11 +5817,6 @@
<source>Less than a minute</source>
<translation>1? ??</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5717,20 +5824,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform></translation>
@@ -5745,6 +5842,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5887,6 +5999,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>??? ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>??? ??? ??? ????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>%1?? ?? ???</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>???? ?? ?? ??</translation>
@@ -5907,31 +6034,6 @@
<translation>??? %1 ??? ??? ?? ??? ???? ???. ?? ?? ??? ?? ???? ?? %2(?)? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>%1?? ?? ???</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>???? ??? ??????.</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>?? %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>??? ?????.</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>?? ???? ?????????.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5953,11 +6055,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>??? ??? ??? ????.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>?? "%1"? ?? ?? ??</translation>
@@ -5968,6 +6065,21 @@
<translation>?? "%1"? ?? ?? ??</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>???? ??? ??????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>?? %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>?? ???? ?????????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1(%2, %3)</translation>
@@ -5976,11 +6088,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&?? ??</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>??? ??</translation>
@@ -6016,22 +6123,11 @@
<translation>???? ? ??? ????? ?? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>?? ???? ????? ?? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>??? ?? ??</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>?? ??? ??</translation>
@@ -6046,6 +6142,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>?? ??? ??? ?? ???? ?????.</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>??? ?? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&?? ??</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6086,6 +6198,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%n?</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>???</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%n??</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1?</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%n?</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>?? ?</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6126,57 +6283,12 @@
<source>Synced %1</source>
<translation>%1 ???</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%n?</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>???</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%n??</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>??</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1?</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%n?</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>?? ?</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>'#' ??? ???? ??? VFS ???? ???? ????.</translation>
@@ -6422,6 +6534,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>?? ? ?? ?? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>?? ?? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>???? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>?? ?? "%1"???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>?? ?? "%1"???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>????? "%1" ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>??? ?? ? ?? ?? ??</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6611,16 +6766,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1GB</translation>
@@ -6635,6 +6780,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6868,16 +7023,16 @@
<translation>?? ? ?? ??</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>??? ?? ?</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>??? ?? ?</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>??? ?? ?</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>??? ?? ???</translation>
@@ -6936,4 +7091,17 @@
<translation>?? ???? ??</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>?? ??? ???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>?? ???? ?? ??? ?? ??? ?? ?? ??? ???? ??????. ?? ?? ???? ?? ?? ? ???? ?? ???? ? ????. ? ?? ???? ?? ??? ???? ??? ????? ???? ?? ?? ?????.</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_lt_LT.ts nextcloud-desktop-3.16.6/translations/client_lt_LT.ts
--- nextcloud-desktop-3.16.4/translations/client_lt_LT.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_lt_LT.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
@@ -570,7 +562,7 @@
<translation>Praleisti</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Saugojimo vieta: ?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Nepa?ym?ti aplankai bus <b>pa?alinti </b> i? J?s? lokalios fail? sistemos ir nebebus sinchronizuojami su ?iuo kompiuteriu.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Atsisakyti</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Taikyti</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Prisijungta su <server> kaip <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Sinchronizuoti visk?</translation>
@@ -635,6 +605,33 @@
<translation>Ry?io nustatymai</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Taikyti</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Saugojimo vieta: ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Atsisakyti</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Prisijungta su <server> kaip <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>N?ra sukonfiguruot? paskyr?.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation type="unfinished"/>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>N?ra sukonfiguruot? paskyr?.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation type="unfinished"/>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -731,12 +739,6 @@
<translation>Nepavyko ?ifruoti aplanko, nes aplanko daugiau neb?ra</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Atverti aplank?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>?ifruoti</translation>
@@ -775,16 +777,6 @@
<translation>Paleisti sinchronizavim? i? naujo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Prat?sti sinchronizavim?</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Pristabdyti sinchronizavim?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Pa?alinti aplank? sinchronizavimo ry??</translation>
@@ -810,21 +802,11 @@
<translation>Aplanko suk?rimas patyr? nes?km?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Nepavyko sukurti vietinio aplanko <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Patvirtinti aplank? sinchronizavimo ry?io pa?alinim?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Ar tikrai norite sustabdyti fail? sinchronizavim? <i>%1</i>? </p><p><b>Pastaba:</b> Failai <b>nebus</b> i?trinti.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Pa?alinti aplank? sinchronizavimo ry??</translation>
@@ -854,23 +836,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -884,36 +866,46 @@
<translation>Vyksta sinchronizavimo operacija.<br/>Ar norite j? nutraukti?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) i? %2 yra naudojami. Kai kuriuose aplankuose gali b?ti naudojami skirtingi apribojimai.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 naudojama</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 i? %2 yra naudojami</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>?iuo metu n?ra informacijos apie saugyklos panaudojim?.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 naudojama</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 kaip %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Nustatyti ?ifravim?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>?i paskyra palaiko i?tisin? ?ifravim?</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
<source>Connected to %1.</source>
<translation>Prisijungta prie %1.</translation>
@@ -929,79 +921,125 @@
<translation>?iuo metu serveris %1 yra technin?s prie?i?ros veiksenoje.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Atsijungta i? %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Jungiamasi prie %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Yra aplank?, kurie nebuvo sinchronizuoti d?l to, kad buvo per dideli: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>Nepavyko prisijungti prie %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Aplankai, kurie nebuvo sinchronizuoti, kadangi jie yra i?orin?s saugyklos:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Serverio konfig?racijos klaida: %1 ties %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Yra aplank?, kurie nebuvo sinchronizuoti d?l to, kad buvo per dideli arba yra i?orin?s saugyklos: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Atverti aplank?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Prat?sti sinchronizavim?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Pristabdyti sinchronizavim?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Nepavyko sukurti vietinio aplanko <i>%1</i>.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Ar tikrai norite sustabdyti fail? sinchronizavim? <i>%1</i>? </p><p><b>Pastaba:</b> Failai <b>nebus</b> i?trinti.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Nesukonfig?ruota %1 sujungim?.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Yra aplank?, kurie nebuvo sinchronizuoti d?l to, kad buvo per dideli: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Aplankai, kurie nebuvo sinchronizuoti, kadangi jie yra i?orin?s saugyklos:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) i? %2 yra naudojami. Kai kuriuose aplankuose gali b?ti naudojami skirtingi apribojimai.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Yra aplank?, kurie nebuvo sinchronizuoti d?l to, kad buvo per dideli arba yra i?orin?s saugyklos: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 i? %2 yra naudojami</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>?iuo metu n?ra informacijos apie saugyklos panaudojim?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 kaip %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>?i paskyra palaiko i?tisin? ?ifravim?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Jungiamasi prie %1?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Nustatyti ?ifravim?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>Nepavyko prisijungti prie %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Serverio konfig?racijos klaida: %1 ties %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Nesukonfig?ruota %1 sujungim?.</translation>
</message>
</context>
<context>
@@ -1116,11 +1154,6 @@
<translation>Liudijimas ir raktas (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Nar?yti?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Liudijimo slapta?odis:</translation>
@@ -1131,6 +1164,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Nar?yti?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Pasirinkti sertifikat?</translation>
@@ -1181,46 +1219,46 @@
<translation>T?sti</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 paskyra</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 aplankas</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Klaida gaunant prieig? prie konfig?racijos failo</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation type="unfinished"/>
</message>
@@ -1262,6 +1300,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1269,6 +1346,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
@@ -1473,7 +1555,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Klaida ra?ant metaduomenis ? duomen? baz?</translation>
</message>
@@ -1603,21 +1685,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Ar norite visam laikui i?trinti katalog? <i>%1</i> ir vis? jo turin??</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Ar norite visam laikui i?trinti fail? <i>%1</i>?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Patvirtinti i?trynim?</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1633,30 +1700,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Nesukonfig?ruota jokia Nextcloud paskyra</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Ar norite visam laikui i?trinti katalog? <i>%1</i> ir vis? jo turin??</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Tapatumo nustatymo klaida: netinkamas naudotojo vardas arba slapta?odis. </translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Ar norite visam laikui i?trinti fail? <i>%1</i>?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Patvirtinti i?trynim?</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Pateikti prisijungimo duomenys yra neteisingi.</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>Serveris, sukonfig?ruotas ?iam klientui, yra per senas.</translation>
@@ -1666,16 +1733,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Pra?ome atnaujinkite server? iki naujausios versijos ir perkraukite klient?.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Tapatumo nustatymo klaida: netinkamas naudotojo vardas arba slapta?odis. </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Nesukonfig?ruota jokia Nextcloud paskyra</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Pateikti prisijungimo duomenys yra neteisingi.</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation type="unfinished"/>
</message>
@@ -1683,19 +1765,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>?ifruot? metaduomen? s?rankos klaida!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1703,27 +1785,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Klaida atveriant katalog? %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Katalogas nerastas: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>Neteisinga failo pavadinimo koduot?</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Klaida skaitant katalog? %1</translation>
</message>
@@ -1962,11 +2044,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
@@ -1978,28 +2055,33 @@
<translation>I? serverio gr??inta klaida: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Nepavyko i?analizuoti serverio gr??into JSON: <br><em> %1 </em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>Atsakyme i? serverio nebuvo vis? tik?tin? lauk?</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Nepavyko i?analizuoti serverio gr??into JSON: <br><em> %1 </em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2042,6 +2124,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 pa?alintas.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 atnaujintas.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 pevadintas ? %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 perkeltas ? %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2057,17 +2167,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>Pa?alintas %1 ir dar %n failas.</numerusform><numerusform>Pa?alintas %1 ir dar %n failai.</numerusform><numerusform>Pa?alintas %1 ir dar %n fail?.</numerusform><numerusform>Pa?alintas %1 ir dar %n failas.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 pa?alintas.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -2083,33 +2182,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>Atnaujintas %1 ir dar %n failas.</numerusform><numerusform>Atnaujintas %1 ir dar %n failai.</numerusform><numerusform>Atnaujintas %1 ir dar %n fail?.</numerusform><numerusform>Atnaujintas %1 ir dar %n failas.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 atnaujintas.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>Failo %1 pavadinimas pakeistas ? %2 ir dar %n failo pavadinimas buvo pakeistas.</numerusform><numerusform>Failo %1 pavadinimas pakeistas ? %2 ir dar %n fail? pavadinimai buvo pakeisti.</numerusform><numerusform>Failo %1 pavadinimas pakeistas ? %2 ir dar %n fail? pavadinimai buvo pakeisti.</numerusform><numerusform>Failo %1 pavadinimas pakeistas ? %2 ir dar %n fail? pavadinimai buvo pakeisti.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 pevadintas ? %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 perkeltas ? %2, o taip pat buvo perkeltas dar %n failas.</numerusform><numerusform>%1 perkeltas ? %2, o taip pat buvo perkelti dar %n failai.</numerusform><numerusform>%1 perkeltas ? %2, o taip pat buvo perkelta dar %n fail?.</numerusform><numerusform>%1 perkeltas ? %2, o taip pat buvo perkeltas dar %n failas.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 perkeltas ? %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2146,66 +2228,66 @@
<translation>Sinchronizavimo veikla</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Nepavyko perskaityti sistemos i?skyrimo failo</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Buvo prid?tas naujas, didesnis nei %1 MB, aplankas: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Buvo prid?tas aplankas i? i?orin? saugyklos.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Jei norite parsisi?sti, eikite ? nustatymus.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Aplankas %1 buvo sukurtas, ta?iau anks?iau i?skirtas i? sinchronizavimo. Aplanke esantys duomenys nebus sinchronizuoti.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Failas %1 buvo sukurtas, ta?iau anks?iau i?skirtas i? sinchronizavimo. Failas nebus sinchronizuotas.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2216,41 +2298,41 @@
Tai rei?kia, kad sinchronizacijos klientas gali i? karto ne?kelti lokali? pakeitim?, o tik juos nuskaityti. ?k?limas bus atliekamas tam tikrais laiko tarpais (pagal numatytuosius nustatymus kas dvi valandas).</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>Pa?alinti visus failus?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2291,11 +2373,6 @@
<translation>Nepavyko atstatyti aplanko b?senos</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(atsargin? kopija)</translation>
@@ -2306,6 +2383,11 @@
<translation>(atsargin? kopija %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Neapibr??ta b?sena.</translation>
@@ -2376,16 +2458,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Sinchronizavimas yra pristabdytas.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (Sinchronizavimas pristabdytas)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2432,6 +2504,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Sinchronizavimas yra pristabdytas.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (Sinchronizavimas pristabdytas)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2475,16 +2557,6 @@
<translation>Klaida ?keliant aplank? s?ra?? i? serverio.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Gaunamas aplank? s?ra?as i? serverio?</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Yra nei?spr?st? konflikt?. Spustel?kite i?samesnei informacijai.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation type="unfinished"/>
@@ -2526,16 +2598,31 @@
<translation>%1 %2?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>Atsiuntimas %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Yra nei?spr?st? konflikt?. Spustel?kite i?samesnei informacijai.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>Atsiuntimas %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Gaunamas aplank? s?ra?as i? serverio?</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2582,21 +2669,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 i? %2, %3 failas(-ai) i? %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>Laukiama dar %n aplanko?</numerusform><numerusform>Laukiama dar %n aplank??</numerusform><numerusform>Laukiama dar %n aplank??</numerusform><numerusform>Laukiama dar %n aplanko?</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>Laukiama dar %n aplanko?</numerusform><numerusform>Laukiama dar %n aplank??</numerusform><numerusform>Laukiama dar %n aplank??</numerusform><numerusform>Laukiama dar %n aplanko?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2756,11 +2838,6 @@
<translation>Bendri nustatymai</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Paleisti ?jungiant kompiuter?</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation type="unfinished"/>
@@ -2771,11 +2848,6 @@
<translation>Sistemos d?klui</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Naudoti &vienspalves piktogramas</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2791,17 +2863,32 @@
<translation>Papildoma</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Patvirtinti, jei sinchronizuojami nuotoliniai aplankai</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Paleisti ?jungiant kompiuter?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Naudoti &vienspalves piktogramas</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2812,11 +2899,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Patvirtinti, jei sinchronizuojami nuotoliniai aplankai</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2868,11 +2950,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Paleisti i? naujo ir atnaujinti</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>&Automati?kai tikrinti, ar yra atnaujinim?</translation>
@@ -2893,6 +2970,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Paleisti i? naujo ir atnaujinti</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Serverio persp?jimai, reikalaujantys imtis veiksm?.</translation>
@@ -2913,6 +3000,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>stabilus</translation>
@@ -2987,6 +3079,11 @@
<source>Debug archive is created at %1</source>
<translation>Derinimo archyvas sukurtas ties %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3151,102 +3248,97 @@
<translation>Naujas failo pavadinimas</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Pervadinti fail?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>Nepavyko sinchronizuoti failo ?%1?, nes jo pavadinime yra simboli?, kurie ?ioje sistemoje yra neleid?iami.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Tikrinami pervadinimo leidimai?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>J?s neturite leidimo pervadinti ?? fail?. Papra?ykite failo autoriaus, kad j? pervadint?.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>Failo pavadinime yra neleistin? simboli?: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>Nepavyko pervadinti failo. ?sitikinkite, kad esate prisijung? prie serverio.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>Nepavyko pervadinti failo, nes serveryje jau yra failas tokiu pavadinimu. Pasirinkite kit? pavadinim?.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>Nepavyko pervadinti vietinio failo. %1</translation>
</message>
@@ -3367,16 +3459,6 @@
<translation><p>Galima nauja ?%1? kliento versija.</p><p>Galite atsisi?sti <b>%2</b>. ?iuo metu ?diegta versija yra %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Praleisti ?? kart?</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Gauti naujinim?</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>Atnaujinimas nepavyko</translation>
@@ -3401,6 +3483,16 @@
<source>Update manually</source>
<translation>Atnaujinti rankiniu b?du</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Praleisti ?? kart?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Gauti naujinim?</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3425,6 +3517,23 @@
<translation>?galiotasis serveris reikalauja nustatyti tapatyb?</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Atsisiuntimo siuntimo sparta</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Apriboti iki</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KB/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation type="unfinished"/>
@@ -3447,46 +3556,29 @@
<translation>Naudoti visuotinius nustatymus</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Atsisiuntimo siuntimo sparta</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Neriboti</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KB/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Apriboti iki</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Apriboti iki 3/4 apskai?iuotos siuntimo spartos</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>?k?limo siuntimo sparta</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Apriboti automati?kai </translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>?k?limo siuntimo sparta</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>?galiotojo serverio pavadinimas </translation>
@@ -3515,6 +3607,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>Nepavyko patikrinti ar yra atnaujinim?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Tikrinamas atnaujinim? serveris?</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>Yra paruo?tas naujas %1 atnaujinimas</translation>
@@ -3545,11 +3647,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>Nepavyko patikrinti ar yra atnaujinim?.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation type="unfinished"/>
@@ -3560,16 +3657,21 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Tikrinamas atnaujinim? serveris?</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Naujinimo b?sena ne?inoma. Neie?kojote naujos versijos.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>N?ra atnaujinim?. J?s ?iuo metu naudojat?s naujausia versija.</translation>
@@ -3745,11 +3847,6 @@
<translation><font color="green">S?kmingai prisijung? prie %1: %2 versija %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>Neteisingas URL</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>%2 nepavyko prisijungti prie %1: <br/>%3</translation>
@@ -3760,6 +3857,16 @@
<translation>%2 prisijungimui prie %1 laikas pasibaig?.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Prieig? apribojo serveris. Nor?dami ?sitikinti, kad turite tinkam? prieig?, <a href="%1">spustel?kite ?ia</a>ir paslauga bus atidaryta j?s? nar?ykl?je.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>Neteisingas URL</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Bandoma prisijungti prie %1 ties %2?</translation>
@@ -3770,11 +3877,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Prieig? apribojo serveris. Nor?dami ?sitikinti, kad turite tinkam? prieig?, <a href="%1">spustel?kite ?ia</a>ir paslauga bus atidaryta j?s? nar?ykl?je.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>Neteisingas atsakymas ? patvirtint? ?WebDAV? u?klaus?</translation>
@@ -3980,62 +4082,34 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Aplankas</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Failas</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4045,6 +4119,24 @@
<translation>Failo pavadinime yra galini? tarp?.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Aplankas</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Failas</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4053,6 +4145,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
@@ -4143,64 +4245,74 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Klaida skaitant duomen? baz?</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation type="unfinished"/>
</message>
@@ -4208,38 +4320,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>ne?inoma i?imtis</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Klaida atnaujinant metaduomenis: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>Failas ?iuo metu yra naudojamas</translation>
</message>
@@ -4257,12 +4369,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>Aptikus fail?, jis buvo pakeistas</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4319,6 +4425,12 @@
<source>The file %1 is currently in use</source>
<translation>?iuo metu failas %1 yra naudojamas</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>Aptikus fail?, jis buvo pakeistas</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4336,39 +4448,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>nepavyko i?trinti failo %1, klaida: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>Nepavyko sukurti aplanko %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>ne?inoma i?imtis</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Klaida atnaujinant metaduomenis: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>?iuo metu failas %1 yra naudojamas</translation>
</message>
@@ -4381,14 +4493,14 @@
<translation>Nepavyko pa?alinti failo %1 d?l kompiuterio failo nesuderinamumo</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4396,49 +4508,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Klaida atnaujinant metaduomenis: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>?iuo metu failas %1 yra naudojamas</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Nepavyko pervadinti failo</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4495,39 +4607,39 @@
<translation>Nepavyko pervadinti %1 ? %2, klaida: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Klaida atnaujinant metaduomenis: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>?iuo metu failas %1 yra naudojamas</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Serveris gr??ino neteising? HTTP kod?. Tikimasi 201, gauta "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Klaida ra?ant metaduomenis ? duomen? baz?</translation>
</message>
@@ -4535,22 +4647,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>Failo %1 ?kelti nepavyko, nes yra kitas failas, besiskiriantis did?iosiomis ir ma?osiomis raid?mis</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>%1 ?k?limui reikalinga vieta vir?ija aplankui skirt? kvot?</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4558,11 +4659,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Failas pa?alintas (prad?kite ?k?limas) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Failas kompiuteryje sinchronizavimo metu buvo pakeistas. Bus t?siama.</translation>
@@ -4592,6 +4688,22 @@
<source>The file %1 is currently in use</source>
<translation>?iuo metu failas %1 yra naudojamas</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>%1 ?k?limui reikalinga vieta vir?ija aplankui skirt? kvot?</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Failas pa?alintas (prad?kite ?k?limas) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4840,6 +4952,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>A? prad?jau kai k? bendrinti su jumis</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Bendrinimo parinktys</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Si?sti priva?i? nuorod? el. pa?tu?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Kopijuoti priva?i? nuorod? ? i?karpin?</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4872,43 +5010,17 @@
<translation>?is aplankas buvo s?kmingai u??ifruotas: ?%1?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>A? prad?jau kai k? bendrinti su jumis</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Bendrinimo parinktys</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Veikla</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Kopijuoti priva?i? nuorod? ? i?karpin?</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Si?sti priva?i? nuorod? el. pa?tu?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4924,11 +5036,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Kopijuoti vidin? nuorod?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>?ifruoti</translation>
@@ -4955,12 +5062,6 @@
<translation><numerusform>Baigia galioti po %1 minut?s</numerusform><numerusform>Baigia galioti po %1 minu?i?</numerusform><numerusform>Baigia galioti po %1 minu?i?</numerusform><numerusform>Baigia galioti po %1 minut?s</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Atverti nar?ykl?je</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation type="unfinished"/>
@@ -4990,6 +5091,17 @@
<source>Delete</source>
<translation>I?trinti</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Kopijuoti vidin? nuorod?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Atverti nar?ykl?je</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5091,13 +5203,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>?is ry?ys N?RA saugus, nes jis n?ra ?ifruotas.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Serverio versija: %1</translation>
@@ -5117,6 +5222,13 @@
<source>The connection is not secure</source>
<translation>Ry?ys n?ra saugus</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>?is ry?ys N?RA saugus, nes jis n?ra ?ifruotas.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5209,6 +5321,32 @@
<translation>%1 (praleista d?l ankstesn?s klaidos, dar kart? bus bandoma po %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Leid?iami tik %1, b?tina bent %2, kad gal?tum?te prad?ti</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>Nepavyko atverti ar sukurti sinchronizavimo duomen? baz?s kompiuteryje. ?sitikinkite, kad ? sinchronizavimo aplank? galite ra?yti.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Ma?ai vietos diske: atsisiuntimai, kurie suma?int? viet? iki %1 buvo praleisti.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>Kai kuriems ?k?limams serveryje neu?teks vietos.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Nei?spr?stas konfliktas.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>Nepavyko atnaujinti failo: %1</translation>
@@ -5229,22 +5367,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Nei?spr?stas konfliktas.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Leid?iami tik %1, b?tina bent %2, kad gal?tum?te prad?ti</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>Nepavyko atverti ar sukurti sinchronizavimo duomen? baz?s kompiuteryje. ?sitikinkite, kad ? sinchronizavimo aplank? galite ra?yti.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
@@ -5264,16 +5386,6 @@
<source>Cannot open the sync journal</source>
<translation>Nepavyksta atverti sinchronizavimo ?urnalo</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Ma?ai vietos diske: atsisiuntimai, kurie suma?int? viet? iki %1 buvo praleisti.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>Kai kuriems ?k?limams serveryje neu?teks vietos.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5284,7 +5396,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5668,11 +5780,6 @@
<source>Less than a minute</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5680,20 +5787,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5708,6 +5805,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5850,6 +5962,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Prisijunkite</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>Sinchronizuojam? aplank? n?ra.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Atsijungta nuo %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Nepalaikoma serverio versija</translation>
@@ -5870,31 +5997,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Atsijungta nuo %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Atsijungta nuo paskyr?:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Paskyra %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Prisijunkite</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Paskyros sinchronizavimas i?jungtas</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5916,11 +6018,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>Sinchronizuojam? aplank? n?ra.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation type="unfinished"/>
@@ -5931,6 +6028,21 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Atsijungta nuo paskyr?:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Paskyra %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Paskyros sinchronizavimas i?jungtas</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5939,11 +6051,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Vietinis aplankas</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Naudotojo vardas</translation>
@@ -5979,22 +6086,11 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Pasirinkite k? sinchronizuoti</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation type="unfinished"/>
@@ -6009,6 +6105,22 @@
<source>Erase local folder and start a clean sync</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Pasirinkite k? sinchronizuoti</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Vietinis aplankas</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6049,6 +6161,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>ateityje</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>dabar</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Ka?kada anks?iau</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6089,57 +6246,12 @@
<source>Synced %1</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>ateityje</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>dabar</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Ka?kada anks?iau</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6385,6 +6497,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Atverti vietin? aplank?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6574,16 +6729,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6598,6 +6743,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6831,16 +6986,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Ruo?iamasi sinchronizuoti</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Ruo?iamasi sinchronizuoti</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Sinchronizavimas yra pristabdytas</translation>
@@ -6899,4 +7054,17 @@
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_lv.ts nextcloud-desktop-3.16.6/translations/client_lv.ts
--- nextcloud-desktop-3.16.4/translations/client_lv.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_lv.ts 2025-06-18 22:57:35.000000000 +0200
@@ -107,7 +107,7 @@
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="180"/>
<source>Sync paused</source>
- <translation>Sinhroniz?cija p?rtraukta</translation>
+ <translation>Sinhroniz??ana aptur?ta</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="183"/>
@@ -127,7 +127,7 @@
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="238"/>
<source>Pause synchronization</source>
- <translation>Aptur?t sinhroniz?ciju</translation>
+ <translation>Aptur?t sinhroniz??anu</translation>
</message>
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="245"/>
@@ -147,7 +147,7 @@
<message>
<location filename="../src/gui/cloudproviders/cloudproviderwrapper.cpp" line="254"/>
<source>Quit sync client</source>
- <translation>Iziet no sinhroniz?cijas klienta</translation>
+ <translation>Iziet no sinhroniz??anas klienta</translation>
</message>
</context>
<context>
@@ -180,27 +180,27 @@
<location filename="../src/gui/tray/CurrentAccountHeaderButton.qml" line="49"/>
<location filename="../src/gui/tray/CurrentAccountHeaderButton.qml" line="121"/>
<source>Pause sync for all</source>
- <translation type="unfinished"/>
+ <translation>Aptur?t sinhroniz??anu visiem</translation>
</message>
<message>
<location filename="../src/gui/tray/CurrentAccountHeaderButton.qml" line="102"/>
<source>Add account</source>
- <translation type="unfinished"/>
+ <translation>Pievienot kontu</translation>
</message>
<message>
<location filename="../src/gui/tray/CurrentAccountHeaderButton.qml" line="106"/>
<source>Add new account</source>
- <translation type="unfinished"/>
+ <translation>Pievienot jaunu kontu</translation>
</message>
<message>
<location filename="../src/gui/tray/CurrentAccountHeaderButton.qml" line="127"/>
<source>Settings</source>
- <translation type="unfinished"/>
+ <translation>Iestat?jumi</translation>
</message>
<message>
<location filename="../src/gui/tray/CurrentAccountHeaderButton.qml" line="138"/>
<source>Exit</source>
- <translation type="unfinished"/>
+ <translation>Iziet</translation>
</message>
<message>
<location filename="../src/gui/tray/CurrentAccountHeaderButton.qml" line="166"/>
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -394,7 +386,7 @@
<message>
<location filename="../src/gui/macOS/ui/FileProviderSyncStatus.qml" line="58"/>
<source>Syncing</source>
- <translation type="unfinished"/>
+ <translation>Sinhroniz?</translation>
</message>
<message>
<location filename="../src/gui/macOS/ui/FileProviderSyncStatus.qml" line="58"/>
@@ -557,7 +549,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Mantojuma imports</translation>
</message>
@@ -572,7 +564,7 @@
<translation>Izlaist</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>Nevar?ja import?t kontus no vec?k? klienta konfigur?cijas.</translation>
</message>
@@ -580,31 +572,9 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Kr?tuve: ...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
- <translation>Neatz?m?t?s mapes tiks <b>no?emtas</b> no lok?l?s dat?u sist?mas un vairs netiks sinhroniz?tas ar ?o datoru</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Atcelt</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Pielietot</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Savienojies ar <server> k? <user></translation>
+ <translation>Neatz?m?t?s mapes tiks <b>no?emtas</b> no viet?j?s dat?u sist?mas un ?aj? dator? vairs netiks sinhroniz?tas</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
@@ -619,12 +589,12 @@
<message>
<location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply manual changes</source>
- <translation>Pielietot manu?l?s izmai?as</translation>
+ <translation>Pielietot pa?roc?g?s izmai?as</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="270"/>
<source>Standard file sync</source>
- <translation type="unfinished"/>
+ <translation>Standarta dat?u sinhroniz??ana</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="314"/>
@@ -634,7 +604,34 @@
<message>
<location filename="../src/gui/accountsettings.ui" line="319"/>
<source>Connection settings</source>
- <translation type="unfinished"/>
+ <translation>Savienojuma iestat?jumi</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Pielietot</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Kr?tuve: ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Atcelt</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Savienojies ar <server> k? <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Nav konfigur?ts konts.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
@@ -671,9 +668,9 @@
<b>?? darb?ba ir neatgriezeniska. Vai tie??m turpin?t?</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Nav konfigur?ts konts.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -686,6 +683,11 @@
<translation>Att?lot mnemoniku</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>Piln?ga ?ifr??ana tika iesp?jota ?im kontam</translation>
@@ -711,6 +713,12 @@
<translation>Mapei ir sinhroniz??anas k??da. ??s mapes ?ifr??ana b?s iesp?jama tikai tad, kad t? b?s sekm?gi sinhroniz?ta.</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -735,12 +743,6 @@
<translation>Nevar?ja ?ifr?t mapi, jo mape vairs nepast?v.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Atv?rt mapi</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>?ifr?t</translation>
@@ -779,19 +781,9 @@
<translation>Restart?t sinroniz?ciju</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Ats?kt sinhroniz??anu</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Aptur?t sinhroniz??anu</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
- <translation>No?emt mapes sinhroniz?cijas savienojumu</translation>
+ <translation>No?emt mapes sinhroniz??anas savienojumu</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="723"/>
@@ -814,21 +806,11 @@
<translation>Mapes izveide neizdev?s</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Nevar?ja izveidot viet?jo mapi <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Apstiprin?t mapes sinhroniz??anas savienojuma no?em?anu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Vai tie??m v?laties aptur?t mapes <i>%1</i> sinhroniz??anu?</p><p><b>Piez?me:</b> Tas <b>neveiks</b> nek?du dat?u dz??anu.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>No?emt mapes sinhroniz??anas savienojumu</translation>
@@ -862,24 +844,24 @@
<translation>Piln?gas ?ifr??anas mnemonika</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>Lai aizsarg?tu j?su kriptogr?fisk?s identit?tes, m?s to ?ifr?jam ar 12 v?rdu mnemoniku no v?rdn?cas. L?dzu, ierakstiet tos un glab?jiet dro??b?. Tie b?s nepiecie?ami, lai pievienotu citas ier?ces savam kontam (piem?ram, mobilais telefons vai kl?pjdators).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>Atsp?jot piln?gu ?ifr??anu</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>Atsp?jot piln?gu ?ifr??anu %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>P?c piln?g?s ?ifr??anas no?em?anas tiks no?emtas viet?ji sinhroniz?t?s ?ifr?t?s datnes.<br>?ifr?t?s datnes paliks server?.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -892,34 +874,44 @@
<translation>Pa?laik notiek sinhroniz??ana.<br/>Vai to izbeigt?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) no %2 izmantots. Da?as mapes, taj? skait? mont?tas no t?kla vai koplietotas, var satur?t da??dus ierobe?ojumus.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 tiek lietots</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 no %2 izmantots</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Pa?laik nav pieejama diska vietas inform?cija.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>Ir mapes, kuru lielums ir p?rsniedzis %1MB: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 tiek lietots</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 k? %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>Piln?ga ?ifr??ana ?aj? kont? tika iesp?jota ar citu ier?ci.<br>To var iesp?jot ?aj? ier?c? ar savas mnemonikas ievad??anu.<br>Tas ?aus sinhroniz?t eso??s ?ifr?t?s mapes.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>Servera versija %1 nav atbalst?ta. Turpin?t uz savu atbild?bu.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Iestat?t ?ifr??anu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>?is konts atbalsta piln?gu ?ifr??anu.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -937,79 +929,125 @@
<translation>Serveris %1 pa?laik ir uztur??anas re??m?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>Server %1 pa?laik tiek novirz?ts vai j?su savienojums atrodas aiz aizsl?gta port?la.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Izrakst?jies no %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Savienojas ar %1 ...</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>??s mapes netika sinhroniz?tas, jo t?s ir p?r?k lielas:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>??s mapes netika sinhroniz?tas, jo t?s atrodas ?r?j?s kr?tuv?s:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Servera konfigur?cijas k??da: %1 pie %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>??s mapes netika sinhroniz?tas, jo t?s ir p?r?k lielas, vai atrodas ?r?j?s kr?tuv?s:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Atv?rt mapi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Nav %1 savienojums konfigur?ts.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Ats?kt sinhroniz??anu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Aptur?t sinhroniz??anu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>??s mapes netika sinhroniz?tas, jo t?s ir p?r?k lielas:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Nevar?ja izveidot viet?jo mapi <i>%1</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>??s mapes netika sinhroniz?tas, jo t?s atrodas ?r?j?s kr?tuv?s:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Vai tie??m aptur?t mapes <i>%1</i> sinhroniz??anu?</p><p><b>Piez?me:</b> Tas <b>neveiks</b> nek?du dat?u izdz??anu.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>??s mapes netika sinhroniz?tas, jo t?s ir p?r?k lielas, vai atrodas ?r?j?s kr?tuv?s:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>Lai aizsarg?tu j?su kriptogr?fisk?s identit?tes, m?s to ?ifr?jam ar 12 v?rdu mnemoniku no v?rdn?cas. L?dzu, ierakstiet tos un glab?jiet dro??b?. Tie b?s nepiecie?ami, lai pievienotu citas ier?ces savam kontam (piem?ram, mobilais telefons vai kl?pjdators).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>Ir mapes, kas ir palielin?ju??s izm?r? p?ri %1MB: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>Atsp?jot piln?gu ?ifr??anu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>Piln?ga ?ifr??ana ?aj? kont? tika iesp?jota ar citu ier?ci.<br>To var iesp?jot ?aj? ier?c? ar savas mnemonikas ievad??anu.<br>Tas ?aus sinhroniz?t eso??s ?ifr?t?s mapes.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>Atsp?jot piln?gu ?ifr??anu %1?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>?is konts atbalsta piln?gu ?ifr??anu.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>P?c piln?g?s ?ifr??anas no?em?anas tiks no?emtas viet?ji sinhroniz?t?s ?ifr?t?s datnes.<br>?ifr?t?s datnes paliks server?.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Iestat?t ?ifr??anu</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) no %2 izmantots. Da?as mapes, taj? skait? mont?tas no t?kla vai koplietotas, var satur?t da??dus ierobe?ojumus.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 no %2 izmantots</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Pa?laik nav pieejama diska vietas inform?cija.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 k? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>Servera versija %1 nav atbalst?ta. Turpin?t uz savu atbild?bu.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>Server %1 pa?laik tiek novirz?ts vai j?su savienojums atrodas aiz aizsl?gta port?la.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Savienojas ar %1 ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>Nevar savienoties ar %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Servera konfigur?cijas k??da: %1 pie %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Nav %1 savienojums konfigur?ts.</translation>
</message>
</context>
<context>
@@ -1124,11 +1162,6 @@
<translation>Sertifik?ts un atsl?ga (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>P?rl?kot ...</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Sertifik?ta parole:</translation>
@@ -1139,6 +1172,11 @@
<translation>?ifr?ta pkcs12 pakete ir stingri ieteicama, jo kopija tiks saglab?ta konfigur?cijas datn?.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>P?rl?kot ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Atlas?t sertifik?tu</translation>
@@ -1189,34 +1227,34 @@
<translation>Turpin?t</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 konti</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 konts</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 mapes</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 mape</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Mantojuma imports</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1224,12 +1262,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>K??da piek??stot konfigur?cijas datnei</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>Notika k??da, piek??stot konfigur?cijas datnei %1. L?dzu, p?rliecinieties, vai datne ir pieejama j?su sist?mas kontam.</translation>
</message>
@@ -1271,6 +1309,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1278,6 +1355,11 @@
<translation>Datni %1 nevar aug?upiel?d?t, jo past?v datne ar t?du pa?u nosaukumu. At??iras tikai lielie/mazie burti. </translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation>Datne s?kum? vai beig?s satur atstarpes, un to nevar?ja p?rd?v?t</translation>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Datnei %1 ir neder?gs modific??anas laiks. Neaug?upiel?d?t uz serveri.</translation>
@@ -1290,7 +1372,7 @@
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="380"/>
<source>File %1 has invalid modification time. Do not upload to the server.</source>
- <translation>Datnei %1 ir neder?gs modific??anas laiks. Neaug?upiel?d?t uz serveri.</translation>
+ <translation>Datnei %1 ir neder?gs labo?anas laiks. Neaug?upiel?d?t server?.</translation>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="393"/>
@@ -1377,7 +1459,7 @@
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it generates a case clash conflict with an existing file on this system.</source>
- <translation>Datni nevar?ja sinhroniz?t, jo t? rada konfliktu ar eso?o datni ?aj? sist?m?.</translation>
+ <translation>Datni nevar?ja sinhroniz?t, jo t? rada nosaukuma lielo/mazo burtu nesader?bu ar ?aj? sist?m? eso?u datni.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.ui" line="36"/>
@@ -1446,7 +1528,7 @@
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="103"/>
<source>The file "%1" could not be synced because of a case clash conflict with an existing file on this system.</source>
- <translation>Datni "%1" nevar sinhroniz?t, jo t? rada konfliktu ar eso?o datni sist?m?.</translation>
+ <translation>Datni "%1" nevar?ja sinhroniz?t, jo t? rada nosaukuma lielo/mazo burtu nesader?bu ar ?aj? sist?m? eso?u datni.</translation>
</message>
<message>
<location filename="../src/gui/caseclashfilenamedialog.cpp" line="104"/>
@@ -1482,7 +1564,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>K??da rakstot metadatus datub?z?</translation>
</message>
@@ -1612,21 +1694,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Vai neatgriezeniski izdz?st mapi <i>%1</i> un visu t?s saturu?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Vai neatgriezeniski izdz?st datni <i>%1</i>?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Apstiprin?t dz??anu</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1642,49 +1709,64 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Nextcloud konts nav konfigur?ts</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Vai neatgriezeniski izdz?st mapi <i>%1</i> un visu t?s saturu?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Pieteik?an?s k??da: vai nu lietot?jv?rds, vai parole ir nepareiza.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Vai neatgriezeniski izdz?st datni <i>%1</i>?</translation>
</message>
<message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Apstiprin?t dz??anu</translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
+ <message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Noilgums</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>The provided credentials are not correct</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
- <translation>Konfigur?tais serveris ir par vecu priek? ?? klienta</translation>
+ <translation>?? klienta konfigur?tais serveris ir p?r?k vecs</translation>
</message>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="299"/>
<source>Please update to the latest server and restart the client.</source>
<translation>L?dzu atjaunini uz jaun?ko servera versiju un atk?rtoti palaid klientu.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Pieteik?an?s k??da: vai nu lietot?jv?rds, vai parole ir nepareiza.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Nextcloud konts nav konfigur?ts</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>The provided credentials are not correct</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>K??da, atce?ot datnes dz??anu</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>K??da atce?ot %1 dz??anu</translation>
</message>
@@ -1692,19 +1774,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Servera k??da: PROPFIND atbilde nav XML form?t?!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1712,27 +1794,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>K??da, atverot mapi %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
- <translation>Mape klientam nav pieejama, at?auja liegta</translation>
+ <translation>Mape klient? nav pieejama, at?auja liegta</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Mape nav atrasta: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>Datnes nosaukuma kod?jums nav der?gs</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>K??da lasot mapi %1</translation>
</message>
@@ -1885,8 +1967,8 @@
<location filename="../src/libsync/encryptfolderjob.cpp" line="129"/>
<source>Could not generate the metadata for encryption, Unlocking the folder.
This can be an issue with your OpenSSL libraries.</source>
- <translation>Nevar?ja ?ener?t metadatus ?ifr??anai, atsl?dz mapi.
-Var?tu b?t probl?ma ar j?su OpenSSL bibliot?k?m.</translation>
+ <translation>Nevar?ja izveidot metadatus ?ifr??anai, atsl?dz mapi.
+Var?tu b?t sare???jums ar OpenSSL bibliot?k?m.</translation>
</message>
</context>
<context>
@@ -1936,7 +2018,7 @@
<location filename="../src/gui/filedetails/filedetails.cpp" line="128"/>
<source>%1 minute(s) ago</source>
<comment>minutes elapsed since file last modified</comment>
- <translation><numerusform>pirms %1 min?t?m</numerusform><numerusform>pirms %1 min?tes</numerusform><numerusform>pirms %1 min?tes/?m</numerusform></translation>
+ <translation><numerusform>pirms %1 min?t?m</numerusform><numerusform>pirms %1 min?tes</numerusform><numerusform>pirms %1 min?t?m</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/filedetails/filedetails.cpp" line="131"/>
@@ -1972,11 +2054,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
@@ -1988,28 +2065,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Notika k??da piek??stot "?etona" galapunktam: <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2052,6 +2134,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 tika no?emta.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ir atjaunin?ts.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 tika p?rd?v?ta par %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 tika p?rvietota uz %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2067,17 +2177,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 un %n citas datne(s) tika no?emtas.</numerusform><numerusform>%1 un %n citas datne(s) tika no?emtas.</numerusform><numerusform>%1 un %n citas datne(s) tika no?emtas.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 tika no?emta.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -2093,37 +2192,20 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 un %n citas datne(s) tika atjaunotas.</numerusform><numerusform>%1 un %n citas datne(s) tika atjaunotas.</numerusform><numerusform>%1 un %n citas datne(s) tika atjaunotas.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ir atjaunin?ts.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 tika p?rd?v?ta par %2 un %n citu dat?u tika p?rd?v?tas.</numerusform><numerusform>%1 tika p?rd?v?ta par %2 un %n cita datne tika p?rd?v?ta.</numerusform><numerusform>%1 tika p?rd?v?ta par %2 un %n citas datnes tika p?rd?v?tas.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 tika p?rd?v?ta par %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
- <translation><numerusform>%1 tika p?rvietota uz %2 un %n citas datne(s) tika p?rvietotas.</numerusform><numerusform>%1 tika p?rvietota uz %2 un %n citas datne(s) tika p?rvietotas.</numerusform><numerusform>%1 tika p?rvietota uz %2 un %n citas datne(s) tika p?rvietotas.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 tika p?rvietota uz %2.</translation>
+ <translation><numerusform>%1 tika p?rvietota uz %2 un %n citas datne(s) tika p?rvietotas.</numerusform><numerusform>%1 tika p?rvietota uz %2 un %n citas datne(s) tika p?rvietotas.</numerusform><numerusform>%1 tika p?rvietota uz %2, un tika p??vietota(s) %n cita(s) datne(s)</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
- <translation><numerusform>%1 un %n cit?m datn?m ir sinhroniz?cijas konflikts.</numerusform><numerusform>%1 un %n cit?m datn?m ir sinhroniz?cijas konflikts.</numerusform><numerusform>%1 un %n cit?m datn?m ir sinhroniz??anas nesader?bas.</numerusform></translation>
+ <translation><numerusform>%1 un %n cit?m datn?m ir sinhroniz??anas nesader?bas.</numerusform><numerusform>%1 un %n citai datnei ir sinhroniz??anas nesader?bas</numerusform><numerusform>%1 un %n cit?m datn?m ir sinhroniz??anas nesader?bas.</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="487"/>
@@ -2133,12 +2215,12 @@
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>%1 un %n citu dat?u nevar?ja sinhroniz?t k??du d??. J?apskata ?urn?ls, lai uzzin?tu vair?k.</numerusform><numerusform>%1 un %n citu datni nevar?ja sinhroniz?t k??du d??. J?apskata ?urn?ls, lai uzzin?tu vair?k.</numerusform><numerusform>%1 un %n citas datnes nevar?ja sinhroniz?t k??du d??. J?apskata ?urn?ls, lai uzzin?tu vair?k.</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
- <translation type="unfinished"/>
+ <translation>%1 nevar?ja sinhroniz?t k??das d??. J?apskata ?urn?ls, lai uzzin?tu vair?k.</translation>
</message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="499"/>
@@ -2156,110 +2238,115 @@
<translation>Sinhroniz??anas darb?ba</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Nevar?ja nolas?t sist?mas iz??mumu datni.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
- <translation>Jauna mape liel?ka par %1 MB ir tikusi pievienota: %2.
+ <translation>Tika pievienota jauna mape, kas ir liel?ka par %1 MB: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
- <translation>Mape no ?r?j?s kr?tuves ir tikusi pievienota.
+ <translation>Tika pievienota mape no ?r?jas kr?tuves.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>L?gums doties uz iestat?jumiem, lai atlas?tu to, ja ir v?lme to lejupiel?d?t.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
- <translation type="unfinished"/>
+ <translation>Mape ir p?rsniegusi iestat?to mapju lieluma ierobe?ojumu (%1 MB): %2.
+%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>Turpin?t sinhroniz??anu</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>P?rtraukt sinhroniz??anu</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
- <translation type="unfinished"/>
+ <translation>Mape %1 ir p?rsniegusi iestat?to mapju lieluma ierobe?ojumu (%2 MB).</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
- <translation type="unfinished"/>
+ <translation>Vai aptur?t ??s mapes sinhroniz??anu?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
%1</source>
- <translation type="unfinished"/>
+ <translation>Nevar?ja uzticami izsekot izmai??m sinhroniz?taj?s map?s.
+
+Tas noz?m?, ka sinhroniz??anas klients var?tu uzreiz neaug?upiel?d?t viet?jas izmai?as, bet t? viet? p?rbaud?t viet?j?s izmai?as un aug?upiel?d?t t?s tikai laiku pa laikam (p?c noklus?juma ik p?c div?m stund?m).
+
+%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2300,11 +2387,6 @@
<translation>Nevar?ja atiestat?t mapju statusu</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(dubl?jums)</translation>
@@ -2315,6 +2397,11 @@
<translation>(dubl?jums %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>Tika atrasts vecs sinhroniz??anas ?urn?ls "%1", bet to nevar?ja no?emt. L?gums p?rliecin?ties, ka neviena lietotne to pa?reiz neizmanto.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Nedefin?ts st?voklis.</translation>
@@ -2332,32 +2419,32 @@
<message>
<location filename="../src/gui/folderman.cpp" line="1799"/>
<source>Syncing %1 of %2 (A few seconds left)</source>
- <translation type="unfinished"/>
+ <translation>Sinhroniz? %1 no %2 (atliku?as da?as sekundes)</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1802"/>
<source>Syncing %1 of %2 (%3 left)</source>
- <translation type="unfinished"/>
+ <translation>Sinhroniz? %1 no %2 (%3 atliku?as)</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1805"/>
<source>Syncing %1 of %2</source>
- <translation type="unfinished"/>
+ <translation>Sinhroniz? %1 no %2</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1811"/>
<source>Syncing %1 (A few seconds left)</source>
- <translation type="unfinished"/>
+ <translation>Sinhroniz? %1 (atliku?as da?as sekundes)</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1813"/>
<source>Syncing %1 (%2 left)</source>
- <translation type="unfinished"/>
+ <translation>Sinhroniz? %1 (%2 atliku?as)</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1816"/>
<source>Syncing %1</source>
- <translation type="unfinished"/>
+ <translation>Sinhroniz? %1</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1821"/>
@@ -2385,16 +2472,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Sinhroniz??ana ir aptur?ta.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (Sinhroniz??ana ir aptur?ta)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2441,13 +2518,23 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Sinhroniz??ana ir aptur?ta.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (Sinhroniz??ana ir aptur?ta)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="55"/>
<source>Add Folder Sync Connection</source>
- <translation type="unfinished"/>
+ <translation>Pievienot mapes sinhroniz??anas savienojumu</translation>
</message>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="297"/>
@@ -2465,7 +2552,7 @@
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="162"/>
<source>Click this button to add a folder to synchronize.</source>
- <translation type="unfinished"/>
+ <translation>Klik??in?t ?o pogu, lai pievienotu mapi, kuru sinhroniz?t.</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="175"/>
@@ -2481,17 +2568,7 @@
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="220"/>
<source>Error while loading the list of folders from the server.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Ir neatrisin?tas nesader?bas. Klik??in?t, lai uzzin?tu vair?k.</translation>
+ <translation>K??da mapju saraksta iel?d??anas no servera laik?.</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
@@ -2506,12 +2583,12 @@
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="328"/>
<source>Synchronizing virtual files in local folder</source>
- <translation type="unfinished"/>
+ <translation>Sinhroniz? virtu?las datnes viet?j? map?</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="330"/>
<source>Synchronizing files in local folder</source>
- <translation type="unfinished"/>
+ <translation>Sinhroniz? datnes viet?j? map?</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1003"/>
@@ -2526,7 +2603,7 @@
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1014"/>
<source>Syncing local and remote changes</source>
- <translation type="unfinished"/>
+ <translation>Sinhroniz? viet?j?s un att?l?s izmai?as</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1064"/>
@@ -2535,15 +2612,30 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Ir neatrisin?tas nesader?bas. Klik??in?t, lai uzzin?tu vair?k.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2591,22 +2683,17 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 no %2, datne %3 no %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>About to start syncing</source>
- <translation type="unfinished"/>
- </message>
<message numerus="yes">
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>Waiting for %n other folder(s) ?</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>About to start syncing</source>
+ <translation>Gras?s uzs?kt sinhroniz??anu</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
<translation type="unfinished"/>
@@ -2633,7 +2720,7 @@
<message>
<location filename="../src/gui/folderwizard.cpp" line="693"/>
<source>Add Folder Sync Connection</source>
- <translation type="unfinished"/>
+ <translation>Pievienot mapes sinhroniz??anas savienojumu</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="695"/>
@@ -2765,11 +2852,6 @@
<translation>Visp?r?gie iestat?jumi</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation type="unfinished"/>
@@ -2780,11 +2862,6 @@
<translation>Sist?mas ikonjoslai</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2800,17 +2877,32 @@
<translation>Papildus</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2821,11 +2913,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2877,11 +2964,6 @@
<translation>Atjaunin??anas kan?ls</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Restart?t && Atjaunin?t</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>&Autom?tiski p?rbaud?t atjaunin?jumus</translation>
@@ -2902,6 +2984,16 @@
<translation>Juridiskais pazi?ojums</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Restart?t && Atjaunin?t</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Serveru pazi?ojumi, kas prasa uzman?bu.</translation>
@@ -2919,7 +3011,12 @@
<message>
<location filename="../src/gui/generalsettings.cpp" line="218"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
- <translation>J?s nevarat atsp?jot autom?tisko startu, jo sist?mas l?me?a autom?tiskais starts ir iesp?jots.</translation>
+ <translation>Nevar atsp?jot autom?tisko palai?anu, jo t? ir iesp?jota sist?mas l?men?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
@@ -2996,6 +3093,11 @@
<source>Debug archive is created at %1</source>
<translation>Atk??do?anas arh?vs ir izveidots %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3044,7 +3146,7 @@
<message>
<location filename="../src/gui/creds/httpcredentialsgui.cpp" line="120"/>
<source><a href="%1">Click here</a> to request an app password from the web interface.</source>
- <translation><a href="%1">Noklik??iniet ?eit</a>, lai piepras?tu lietotnes paroli no t?mek?a saskarnes.</translation>
+ <translation><a href="%1">Klik??in?t ?eit</a>, lai t?mek?a saskarn? piepras?tu lietotnes paroli.</translation>
</message>
</context>
<context>
@@ -3142,7 +3244,7 @@
<message>
<location filename="../src/gui/invalidfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it contains characters which are not allowed on this system.</source>
- <translation type="unfinished"/>
+ <translation>Datni nevar?ja sinhroniz?t, jo t? satur rakstz?mes, kas ?aj? sist?m? nav at?autas.</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.ui" line="39"/>
@@ -3160,19 +3262,14 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
- <translation type="unfinished"/>
+ <translation>P?rd?v?t datni</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>??s rakstz?mes sist?m? nav at?autas: * " | & ? , ; : \ / ~ < > atstarpes s?kum?/beig?s</translation>
+ <translation>Datni "%1" nevar?ja sinhroniz?t, jo nosaukums satur rakstz?mes, kas ?aj? sist?m? nav at?autas.</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
@@ -3180,82 +3277,82 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
- <translation type="unfinished"/>
+ <translation>Datni "%1" nevar?ja sinhroniz?t, jo nosaukums satur rakstz?mes, kuras server? nav at?autas.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
- <translation type="unfinished"/>
+ <translation>P?rbauda p?rd?v??anas at?aujas?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation type="unfinished"/>
</message>
@@ -3360,7 +3457,7 @@
<message>
<location filename="../src/gui/macOS/fileprovidereditlocallyjob.cpp" line="89"/>
<source>The file identifier is empty.</source>
- <translation type="unfinished"/>
+ <translation>Datnes identifikators ir tuk?s</translation>
</message>
</context>
<context>
@@ -3376,16 +3473,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Ieg?t atjaunin?jumu</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>Atjaunin??ana neizdev?s</translation>
@@ -3410,13 +3497,23 @@
<source>Update manually</source>
<translation>Pa?roc?gi atjaunin?t</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Ieg?t atjaunin?jumu</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
<message>
<location filename="../src/gui/networksettings.ui" line="45"/>
<source>Proxy Settings</source>
- <translation type="unfinished"/>
+ <translation>Starpniekservera iestat?jumi</translation>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="51"/>
@@ -3434,6 +3531,23 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation type="unfinished"/>
@@ -3456,43 +3570,26 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="393"/>
- <location filename="../src/gui/networksettings.ui" line="440"/>
- <source>Limit automatically</source>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
+ <location filename="../src/gui/networksettings.ui" line="393"/>
+ <location filename="../src/gui/networksettings.ui" line="440"/>
+ <source>Limit automatically</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3524,6 +3621,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>Jauns %1 atjaunin?jums ir gatavs</translation>
@@ -3554,11 +3661,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation type="unfinished"/>
@@ -3569,13 +3671,18 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
- <source>Update status is unknown: Did not check for new updates.</source>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3621,7 +3728,7 @@
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="322"/>
<source>Sync the folder "%1"</source>
- <translation type="unfinished"/>
+ <translation>Sinhroniz?t mapi "%1"</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="327"/>
@@ -3719,7 +3826,7 @@
<location filename="../src/libsync/owncloudpropagator.cpp" line="937"/>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1014"/>
<source>Impossible to get modification time for file in conflict %1</source>
- <translation type="unfinished"/>
+ <translation>Nav iesp?jams ieg?t labo?anas laiku nesader?gajai datnei %1</translation>
</message>
</context>
<context>
@@ -3754,11 +3861,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>Nepareizi nor?d?ta adrese uz serveri.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation type="unfinished"/>
@@ -3769,6 +3871,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>Nepareizi nor?d?ta adrese uz serveri.</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation type="unfinished"/>
@@ -3779,11 +3891,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation type="unfinished"/>
@@ -3836,7 +3943,7 @@
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="611"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
- <translation type="unfinished"/>
+ <translation>Att?l? mape %1 jau past?v. Savienojas ar to, lai sinhroniz?tu.</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="613"/>
@@ -3898,7 +4005,7 @@
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="702"/>
<source>Your account is now syncing with virtual files support. This means that all your files are online-only by default, and will be downloaded on-demand when you open them. You may find your files under the <b>Locations</b> section of the Finder sidebar.</source>
- <translation type="unfinished"/>
+ <translation>Tavs konts tagad tiek sinhroniz?ts ar virtu?lo dat?u atbalstu. Tas noz?m?, ka visas Tavas datnes p?c noklus?juma ir tikai tie?saist?, un tiks lejupiel?d?tas p?c piepras?juma, kad atv?rsi t?s. Savas datnes vari atrast sada?? <b>Atra?an?s vietas</b> mekl?t?ja s?njosl?.</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="745"/>
@@ -3911,7 +4018,7 @@
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="104"/>
<source>Add %1 account</source>
- <translation type="unfinished"/>
+ <translation>Pievienot %1 kontu</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="108"/>
@@ -3989,68 +4096,58 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
+ <source>File names containing the character "%1" are not supported on this file system.</source>
+ <comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
- <source>File names containing the character "%1" are not supported on this file system.</source>
- <comment>%1: the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
+ <source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
+ <source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>Folder name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
+ <source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
+ <source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
- <source>File name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="433"/>
+ <source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
- <source>Folder name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
- <source>File name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="433"/>
- <source>Filename contains trailing spaces.</source>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
@@ -4062,6 +4159,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
@@ -4152,64 +4259,74 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
+ <translation>Nevar sinhroniz?t neder?ga labo?anas laika d??</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation type="unfinished"/>
</message>
@@ -4217,38 +4334,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
- <translation type="unfinished"/>
+ <translation>K??da metadatu atjaunin??an? neder?ga labo?anas laika d??</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4266,12 +4383,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4300,12 +4411,12 @@
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="940"/>
<source>The file could not be downloaded completely.</source>
- <translation type="unfinished"/>
+ <translation>Datni nevar?ja piln?b? lejupiel?d?t.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="947"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
- <translation type="unfinished"/>
+ <translation>Lejupiel?d?t? datne ir tuk?a, bet serveris sac?ja, ka tai vajadz?tu b?t %1.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1210"/>
@@ -4328,6 +4439,12 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4345,39 +4462,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4390,14 +4507,14 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4405,49 +4522,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4504,39 +4621,39 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
@@ -4544,37 +4661,21 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
<source>File %1 has invalid modification time. Do not upload to the server.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation type="unfinished"/>
+ <translation>Datnei %1 ir neder?gs labo?anas laiks. Neaug?upiel?d?t server?.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
- <translation type="unfinished"/>
+ <translation>Viet?j? datne sinhroniz??anas laik? tika izmain?ta. T? tiks ats?kta.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="452"/>
@@ -4601,6 +4702,22 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4725,7 +4842,7 @@
<message>
<location filename="../src/gui/selectivesyncdialog.cpp" line="310"/>
<source>An error occurred while loading the list of sub folders.</source>
- <translation type="unfinished"/>
+ <translation>Apak?mapju saraksta iel?d??anas laik? atgad?j?s k??da.</translation>
</message>
</context>
<context>
@@ -4747,12 +4864,12 @@
<location filename="../src/gui/settingsdialog.cpp" line="104"/>
<source>%1 Settings</source>
<extracomment>This name refers to the application name e.g Nextcloud</extracomment>
- <translation type="unfinished"/>
+ <translation>%1 iestat?jumi</translation>
</message>
<message>
<location filename="../src/gui/settingsdialog.cpp" line="122"/>
<source>General</source>
- <translation>Visp?r?gs</translation>
+ <translation>Visp?r?gi</translation>
</message>
<message>
<location filename="../src/gui/settingsdialog.cpp" line="137"/>
@@ -4788,7 +4905,7 @@
<message>
<location filename="../src/gui/filedetails/sharemodel.cpp" line="583"/>
<source>Today</source>
- <translation type="unfinished"/>
+ <translation>?odien</translation>
</message>
<message>
<location filename="../src/gui/filedetails/sharemodel.cpp" line="757"/>
@@ -4849,6 +4966,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Kop?t priv?to saiti starpliktuv?</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4881,43 +5024,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Kop?t priv?to saiti starpliktuv?</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4933,11 +5050,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -4964,12 +5076,6 @@
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Atv?rt p?rl?k?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Atrisin?t nesader?bu?</translation>
@@ -4999,6 +5105,17 @@
<source>Delete</source>
<translation>Izdz?st</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Atv?rt p?rl?k?</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5099,12 +5216,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Servera versija: %1</translation>
@@ -5124,6 +5235,12 @@
<source>The connection is not secure</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5195,12 +5312,12 @@
<message>
<location filename="../src/gui/sslerrordialog.cpp" line="214"/>
<source>Effective Date: %1</source>
- <translation type="unfinished"/>
+ <translation>Sp?k? st??an?s datums: %1</translation>
</message>
<message>
<location filename="../src/gui/sslerrordialog.cpp" line="215"/>
<source>Expiration Date: %1</source>
- <translation type="unfinished"/>
+ <translation>Beigu datums: %1</translation>
</message>
<message>
<location filename="../src/gui/sslerrordialog.cpp" line="219"/>
@@ -5216,23 +5333,24 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="383"/>
- <source>Could not update file: %1</source>
- <translation type="unfinished"/>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Pieejami tikai %1, nepiecie?ami vismaz %2, lai uzs?ktu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="412"/>
- <source>Could not update virtual file metadata: %1</source>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="419"/>
- <source>Could not update file metadata: %1</source>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="433"/>
- <source>Could not set file record to local DB: %1</source>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -5241,14 +5359,23 @@
<translation>Neatrisin?ta nesader?ba.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <location filename="../src/libsync/syncengine.cpp" line="383"/>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="412"/>
+ <source>Could not update virtual file metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="419"/>
+ <source>Could not update file metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="433"/>
+ <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/>
</message>
<message>
@@ -5271,16 +5398,6 @@
<source>Cannot open the sync journal</source>
<translation>Nevar atv?rt sinhroniz??anas ?urn?lu</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5291,7 +5408,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5305,7 +5422,7 @@
<message>
<location filename="../src/gui/tray/syncstatussummary.cpp" line="151"/>
<source>Some files couldn't be synced!</source>
- <translation type="unfinished"/>
+ <translation>Da?as datnes nevar?ja sinhroniz?t.</translation>
</message>
<message>
<location filename="../src/gui/tray/syncstatussummary.cpp" line="152"/>
@@ -5315,17 +5432,17 @@
<message>
<location filename="../src/gui/tray/syncstatussummary.cpp" line="160"/>
<source>Checking folder changes</source>
- <translation type="unfinished"/>
+ <translation>P?rbauda mapju izmai?as</translation>
</message>
<message>
<location filename="../src/gui/tray/syncstatussummary.cpp" line="162"/>
<source>Syncing changes</source>
- <translation type="unfinished"/>
+ <translation>Sinhroniz? izmai?as</translation>
</message>
<message>
<location filename="../src/gui/tray/syncstatussummary.cpp" line="171"/>
<source>Sync paused</source>
- <translation type="unfinished"/>
+ <translation>Sinhroniz??ana ir aptur?ta</translation>
</message>
<message>
<location filename="../src/gui/tray/syncstatussummary.cpp" line="179"/>
@@ -5340,7 +5457,7 @@
<message>
<location filename="../src/gui/tray/syncstatussummary.cpp" line="221"/>
<source>Syncing</source>
- <translation type="unfinished"/>
+ <translation>Sinhroniz?</translation>
</message>
<message>
<location filename="../src/gui/tray/syncstatussummary.cpp" line="234"/>
@@ -5355,7 +5472,7 @@
<message>
<location filename="../src/gui/tray/syncstatussummary.cpp" line="243"/>
<source>Syncing file %1 of %2</source>
- <translation type="unfinished"/>
+ <translation>Sinhroniz? %1. datni no %2</translation>
</message>
</context>
<context>
@@ -5373,13 +5490,13 @@
<message>
<location filename="../src/gui/systray.cpp" line="187"/>
<source>Open main dialog</source>
- <translation type="unfinished"/>
+ <translation>Atv?rt galveno dialoglogu</translation>
</message>
<message>
<location filename="../src/gui/systray.cpp" line="190"/>
<location filename="../src/gui/systray.cpp" line="200"/>
<source>Pause sync</source>
- <translation type="unfinished"/>
+ <translation>Aptur?t sinhroniz??anu</translation>
</message>
<message>
<location filename="../src/gui/systray.cpp" line="191"/>
@@ -5400,12 +5517,12 @@
<message>
<location filename="../src/gui/systray.cpp" line="194"/>
<source>Exit %1</source>
- <translation type="unfinished"/>
+ <translation>Iziet no %1</translation>
</message>
<message>
<location filename="../src/gui/systray.cpp" line="200"/>
<source>Pause sync for all</source>
- <translation type="unfinished"/>
+ <translation>Aptur?t sinhroniz??anu visiem</translation>
</message>
<message>
<location filename="../src/gui/systray.cpp" line="206"/>
@@ -5675,11 +5792,6 @@
<source>Less than a minute</source>
<translation>Maz?k par min?ti</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5687,20 +5799,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5715,6 +5817,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5778,7 +5895,7 @@
<location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="80"/>
<location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="91"/>
<source>Error updating metadata due to invalid modification time</source>
- <translation type="unfinished"/>
+ <translation>K??da metadatu atjaunin??an? neder?ga labo?anas laika d??</translation>
</message>
</context>
<context>
@@ -5787,7 +5904,7 @@
<location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="75"/>
<location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="86"/>
<source>Error updating metadata due to invalid modification time</source>
- <translation type="unfinished"/>
+ <translation>K??da metadatu atjaunin??an? neder?ga labo?anas laika d??</translation>
</message>
</context>
<context>
@@ -5846,7 +5963,7 @@
<message>
<location filename="../src/gui/wizard/welcomepage.cpp" line="71"/>
<source>Screensharing, online meetings & web conferences</source>
- <translation>Ekr?na kop?go?ana, tie?saistes sapulces un t?mek?a apsprie?an?s</translation>
+ <translation>Ekr?na kop?go?ana, tie?saistes sapulces un t?mek?a apspriedes</translation>
</message>
<message>
<location filename="../src/gui/wizard/welcomepage.cpp" line="111"/>
@@ -5857,6 +5974,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>L?dzu piesakieties</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>Nav konfigur?ta neviena sinhroniz?jama mape.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Atvienojies no %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Neatbalst?ta servera versija</translation>
@@ -5877,31 +6009,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Atvienojies no %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Atvienojies no kontiem:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Konts %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>L?dzu piesakieties</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Konta sinhroniz??ana ir atsp?jota</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5923,11 +6030,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>Nav konfigur?ta neviena sinhroniz?jama mape.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation type="unfinished"/>
@@ -5938,6 +6040,21 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Atvienojies no kontiem:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Konts %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Konta sinhroniz??ana ir atsp?jota</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5946,11 +6063,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Viet?ja mape</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation type="unfinished"/>
@@ -5983,23 +6095,12 @@
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="360"/>
<source>Ask before syncing folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
+ <translation>Vaic?t pirms sinhroniz?t mapes, kas liel?kas par</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Izv?l?ties, ko sinhroniz?t</translation>
+ <translation>Vaic?t pirms ?r?ju kr?tuvju sinhroniz??anas</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
@@ -6016,6 +6117,22 @@
<source>Erase local folder and start a clean sync</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Izv?l?ties, ko sinhroniz?t</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Viet?ja mape</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6056,6 +6173,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>n?kotn?</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>tikko</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>K?du laiku atpaka?</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6084,69 +6246,24 @@
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="809"/>
<source>You created %1</source>
- <translation>J?s izveidoj?t %1</translation>
+ <translation>Tu izveidoji %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="811"/>
<source>You changed %1</source>
- <translation>Tu main?ji %1</translation>
+ <translation>Tu izmain?ji %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="835"/>
<source>Synced %1</source>
<translation>Sinhroniz?ta %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>n?kotn?</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>?obr?d</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>K?du laiku atpaka?</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6347,7 +6464,7 @@
<message>
<location filename="../src/gui/tray/SyncStatus.qml" line="94"/>
<source>Sync now</source>
- <translation>Sinhroniz?t t?l?t</translation>
+ <translation>Sinhroniz?t tagad</translation>
</message>
<message>
<location filename="../src/gui/tray/SyncStatus.qml" line="113"/>
@@ -6392,6 +6509,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>Atv?rt viet?j?s vai grupas mapes</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Atv?rt viet?jo mapi</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Savienots</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>Atvienots</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>Atv?rt viet?jo mapi "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>Atv?rt grupas mapi "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>Atv?rt %1 dat?u p?rl?k?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>Lietot?ja grupas un viet?jo mapju izv?lne</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6454,7 +6614,7 @@
<message>
<location filename="../src/gui/tray/UnifiedSearchResultNothingFound.qml" line="40"/>
<source>No results for</source>
- <translation>Nav rezult?tu</translation>
+ <translation>Nav izn?kuma</translation>
</message>
</context>
<context>
@@ -6581,16 +6741,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6605,6 +6755,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6810,7 +6970,7 @@
<message>
<location filename="../src/libsync/theme.cpp" line="105"/>
<source>Waiting to start syncing</source>
- <translation type="unfinished"/>
+ <translation>Gaida sinhroniz??anas uzs?k?anu</translation>
</message>
<message>
<location filename="../src/libsync/theme.cpp" line="108"/>
@@ -6838,16 +6998,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Gatavoj?s sinhroniz?t</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Gatavoj?s sinhroniz?t</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Sinhroniz??ana ir aptur?ta</translation>
@@ -6863,7 +7023,7 @@
<message>
<location filename="../src/gui/guiutility.cpp" line="46"/>
<source>There was an error when launching the browser to go to URL %1. Maybe no default browser is configured?</source>
- <translation>Notika k??da palai?ot p?rl?ku lai ietu uz saiti %1. Iesp?jams nav konfigur?ts noklus?tais p?rl?ks?</translation>
+ <translation>P?rl?ka palai?anas, lai dotos uz URL %1, laik? bija k??da. Varb?t nav iestat?ts noklus?juma p?rl?ks?</translation>
</message>
<message>
<location filename="../src/gui/guiutility.cpp" line="69"/>
@@ -6873,7 +7033,7 @@
<message>
<location filename="../src/gui/guiutility.cpp" line="70"/>
<source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
- <translation>Notika k??da atverot e-pasta klientu, lai izveidotu jaunu zi?ojumu. Iesp?jams nav konfigur?ts noklus?tais e-pasta klients?</translation>
+ <translation>E-pasta klienta palai?anas, lai izveidotu jaunu zi?ojumu, laik? bija k??da. Varb?t nav iestat?ts noklus?juma e-pasta klients?</translation>
</message>
<message>
<location filename="../src/gui/guiutility.cpp" line="85"/>
@@ -6906,4 +7066,17 @@
<translation>Atbr?vot viet?jo vietu</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_mk.ts nextcloud-desktop-3.16.6/translations/client_mk.ts
--- nextcloud-desktop-3.16.4/translations/client_mk.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_mk.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
@@ -570,7 +562,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>??????? ?? ???????????: ...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>??????????????? ????? ?? ????? <b>?????????</b> ?? ?????? ??????? ?????? ? ???? ?? ????? ?????????????? ?? ???? ????????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>??????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>???????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>??????? ?? <server> ???? <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>????????????? ??</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>??????? ?? ???????????: ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>??????? ?? <server> ???? <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>???? ????????????? ??????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation type="unfinished"/>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>???? ????????????? ??????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation type="unfinished"/>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -730,12 +738,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>?????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>???????????</translation>
@@ -774,16 +776,6 @@
<translation>??????????? ??????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>???????? ??????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>???????? ??????????????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>???????? ????? ?? ??????????????</translation>
@@ -809,21 +801,11 @@
<translation>????????? ???????? ?? ?????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>?????? ?? ?? ?????? ??????? ????? <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>??????? ???????????? ?? ????? ?? ??????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>???? ??? ??????? ???? ?????? ?? ?? ????????? ???????????????? ?? ??????? <i>%1</i>?</p><p><b>?????????:</b> ??? <b>????</b> ?? ??????? ???? ???? ????????.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>???????? ????? ?? ??????????????</translation>
@@ -853,23 +835,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -883,34 +865,44 @@
<translation>???????????????? ? ??????????.<br/>???? ?????? ?? ?? ??????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>??????????? %1 (%3%) ?? %2. ????? ?????, ??????????? ?? ? ?????? ??????????? ??? ??????????? ?????, ???? ?? ????? ???????? ?????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>??????????? %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>??????????? %1 ?? %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>?????????? ???? ?????????? ?? ????????????? ???????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>??????????? %1</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 ???? %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>????????? ?? ???????? %1 ? ????????? ? ?? ? ?????????! ?????????? ?? ???????? ?????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>??????? ??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>?? ???? ?????? ? ?????????? ????-??-???? ??????????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -928,79 +920,125 @@
<translation>???????? %1 ? ?????????? ?? ??? ?? ?????????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>??????? ?? %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>?????????? ?? %1 ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>??? ????? ??? ?? ?? ?????????????? ??????? ?? ???????? ??????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>??? ????? ??? ?? ?? ?????????????? ??????? ??? ?? ?????????? ?????????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>?????? ?? ??????????????? ?? ????????: %1 ?? %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>??? ????? ??? ?? ?? ?????????????? ??????? ?? ???????? ?????? ??? ?? ?????????? ?????????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>?????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>???????? ??????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>???????? ??????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>?????? ?? ?? ?????? ??????? ????? <i>%1</i>.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>???? ??? ??????? ???? ?????? ?? ?? ????????? ???????????????? ?? ??????? <i>%1</i>?</p><p><b>?????????:</b> ??? <b>????</b> ?? ??????? ???? ???? ????????.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>???? ????????????? %1 ?????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>??? ????? ??? ?? ?? ?????????????? ??????? ?? ???????? ??????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>??? ????? ??? ?? ?? ?????????????? ??????? ??? ?? ?????????? ?????????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>??????????? %1 (%3%) ?? %2. ????? ?????, ??????????? ?? ? ?????? ??????????? ??? ??????????? ?????, ???? ?? ????? ???????? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>??? ????? ??? ?? ?? ?????????????? ??????? ?? ???????? ?????? ??? ?? ?????????? ?????????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>??????????? %1 ?? %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>?????????? ???? ?????????? ?? ????????????? ???????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 ???? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>????????? ?? ???????? %1 ? ????????? ? ?? ? ?????????! ?????????? ?? ???????? ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>?????????? ?? %1 ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>?? ???? ?????? ? ?????????? ????-??-???? ??????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>?????? ?? ??????????????? ?? ????????: %1 ?? %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>??????? ??????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>???? ????????????? %1 ?????.</translation>
</message>
</context>
<context>
@@ -1115,11 +1153,6 @@
<translation>?????????? & ???? ((pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>????????? ...</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>??????? ?? ????????????:</translation>
@@ -1130,6 +1163,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>????????? ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>???????? ??????????</translation>
@@ -1180,46 +1218,46 @@
<translation>????????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>?????? ??? ????????? ?? ???????????????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>??????? ?????? ??? ?????????????? ?? ???????????????? ???????? ?? %1. ?????? ??????? ???? ?????? ?????? ???? ?? ???????? ?? ???????????????? ????????.</translation>
</message>
@@ -1261,6 +1299,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1268,6 +1345,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
@@ -1472,7 +1554,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>?????? ??? ?????????? ?? ???????????? ?? ?????? ?? ????????</translation>
</message>
@@ -1602,21 +1684,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>???? ?? ??????? ???? ????? ?? ?? ???????? ??????? <i>%1</i> ? ?????? ???????? ?? ????</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>???? ?? ??????? ???? ????? ?? ?? ???????? ?????????? <i>%1</i>?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>??????? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1632,30 +1699,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>???? ?????? ?????????????</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>???? ?? ??????? ???? ????? ?? ?? ???????? ??????? <i>%1</i> ? ?????? ???????? ?? ????</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>?????? ??? ???????????????: ????????? ?????????? ??? ??? ??????? ?? ????????.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>???? ?? ??????? ???? ????? ?? ?? ???????? ?????????? <i>%1</i>?</translation>
</message>
<message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>??????? ???????</translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
+ <message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>???? ???</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>???????????? ?????????? ?? ?? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>???????? ?? ???? ?????? ? ???????? ????</translation>
@@ -1665,16 +1732,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>?? ?????? ?????????? ?? ????????? ?? ???????? ? ???????????? ?? ????????.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>?????? ??? ???????????????: ????????? ?????????? ??? ??? ??????? ?? ????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>???? ?????? ?????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>???????????? ?????????? ?? ?? ????????</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation type="unfinished"/>
</message>
@@ -1682,19 +1764,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1702,27 +1784,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>?????? ??? ???????? ?? ??????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>??????? ?? ? ???????? ?? ????????, ???????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>??????? ?? ? ??????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>?????? ??? ?????? ?? ??????? %1</translation>
</message>
@@ -1961,11 +2043,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
@@ -1977,15 +2054,14 @@
<translation>?????? ????????? ?? ????????: <em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
- <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
+ <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
<message>
@@ -1995,10 +2071,16 @@
<translation>????????? ?? ???????? ?? ?? ?????? ???? ????????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2041,6 +2123,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>?????????? %1 ? ?????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ? ?????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>?????????? %1 ? ???????????? ?? %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>?????????? %1 ? ?????????? ?? %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2056,17 +2166,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>?????????? %1 ? %n ????? ???????? ?? ?????????.</numerusform><numerusform>?????????? %1 ? %n ????? ???????? ?? ?????????.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>?????????? %1 ? ?????????.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 ? %n ????? ???????? ? ????????.</numerusform><numerusform>%1 ? %n ????? ???????? ?? ????????.</numerusform></translation>
@@ -2082,33 +2181,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 ? %n ????? ???????? ?? ?????????.</numerusform><numerusform>%1 ? %n ????? ???????? ?? ?????????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ? ?????????.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>?????????? %1 ? ???????????? ?? %2 ? %n ????? ???????? ?? ????????????.</numerusform><numerusform>?????????? %1 ? ???????????? ?? %2 ? %n ????? ???????? ?? ????????????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>?????????? %1 ? ???????????? ?? %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>?????????? %1 ? ?????????? ?? %2 ? %n ????? ???????? ?? ??????????.</numerusform><numerusform>?????????? %1 ? ?????????? ?? %2 ? %n ????? ???????? ?? ??????????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>?????????? %1 ? ?????????? ?? %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2145,67 +2227,67 @@
<translation>?????????? ?? ??????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>???? ????? ???????? ?? %1 MB ? ????????: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>????? ?? ?????????? ????????? ? ????????.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>????? ?? ??????????? ? ???????? ?? ??? ?????? ?? ?? ?????????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>??????? %1 ? ???????? ?? ????????? ???? ????????? ?? ??????????????. ?????????? ?? ??? ???? ?? ????? ??????????????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>?????????? %1 ? ???????? ?? ????????? ???? ????????? ?? ??????????????. ??? ???? ?? ???? ??????????????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2214,41 +2296,41 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2289,11 +2371,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation> (backup)</translation>
@@ -2304,6 +2381,11 @@
<translation> (backup %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>???????????? ????????.</translation>
@@ -2374,16 +2456,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>???????????????? ? ?????????.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (???????????????? ? ?????????)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2430,6 +2502,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>???????????????? ? ?????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (???????????????? ? ?????????)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2473,16 +2555,6 @@
<translation>?????? ??? ????????? ?? ??????? ?? ????? ?? ????????.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>????????? ?? ??????? ?? ????? ?? ???????? ...</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>??? ???????? ?????????. ???????? ?? ??????.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>??????????? ? ???????? ?? ????????? ????????.</translation>
@@ -2524,16 +2596,31 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>??? ???????? ?????????. ???????? ?? ??????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation type="unfinished"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>????????? ?? ??????? ?? ????? ?? ???????? ...</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2580,21 +2667,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 ?? %2, ???????? %3 ?? %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>?????? ?? ????? ????? ?</numerusform><numerusform>?????? ?? %n ????? ????? ?</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>?????? ?? ????? ????? ?</numerusform><numerusform>?????? ?? %n ????? ????? ?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2754,11 +2836,6 @@
<translation>????? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&????????? ??? ?????????? ?? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation type="unfinished"/>
@@ -2769,11 +2846,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>??????? &????????????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2789,17 +2861,32 @@
<translation>????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>??????? ??????? ?? ?????????????? ?? ?????????? ?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&????????? ??? ?????????? ?? ????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>??????? &????????????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2810,11 +2897,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>??????? ??????? ?? ?????????????? ?? ?????????? ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2866,11 +2948,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&??????????? && ????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation type="unfinished"/>
@@ -2891,6 +2968,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&??????????? && ????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>??????????? ?? ???????? ?? ??? ? ???????? ????????.</translation>
@@ -2911,6 +2998,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>????????</translation>
@@ -2985,6 +3077,11 @@
<source>Debug archive is created at %1</source>
<translation>Debug ?????? ???????? ?? %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3149,102 +3246,97 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>??????????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation type="unfinished"/>
</message>
@@ -3365,16 +3457,6 @@
<translation><p>???? ??????? ?? %1 ?????? ? ????????.</p><p><b>%2</b> ? ???????? ?? ?????????. ????????????? ??????? ? %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>????????? ????</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>???????? ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>????????? ?????????</translation>
@@ -3399,6 +3481,16 @@
<source>Update manually</source>
<translation>????? ?????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>????????? ????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>???????? ?????????</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3423,6 +3515,23 @@
<translation>???????? ? ????????????????? ?? proxy ????????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>?????? ?? ?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>???????? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation type="unfinished"/>
@@ -3445,46 +3554,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>?????? ?? ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>??? ?????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>???????? ??</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>???????? ?? 3/4 ?? ?????????? ?????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>?????? ?? ???????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>???????? ??????????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>?????? ?? ???????????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Proxy ??????</translation>
@@ -3513,6 +3605,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>?????? ?? ?? ??????? ?? ?????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>???????? ?? ????????? ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation type="unfinished"/>
@@ -3543,11 +3645,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>?????? ?? ?? ??????? ?? ?????????.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation type="unfinished"/>
@@ -3558,16 +3655,21 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>???????? ?? ????????? ...</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>???????? ?? ????????? ? ????????: ???? ???????? ???????? ?? ?????????.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>???? ???????? ?????????. ?????? ??????????? ? ?? ?????????? ???????.</translation>
@@ -3743,11 +3845,6 @@
<translation><font color="green">??????? ?????????? ?? %1: %2 ??????? %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>????????? URL</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>????????? ?????????? ?? %1 ?? %2:<br/>%3</translation>
@@ -3758,6 +3855,16 @@
<translation>?????? ??????? ?? ?????????? ?? %1 ?? %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>????????? URL</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>???? ?? ?????????? ?? %1 ?? %2 ?</translation>
@@ -3768,11 +3875,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation type="unfinished"/>
@@ -3978,62 +4080,34 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>????? ?? ?????????? ????? ????????? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4043,6 +4117,24 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4051,6 +4143,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
@@ -4141,64 +4243,74 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>?? ? ????????? ??????? ?????? ??????? ?? ???????? ???????? ?? ???? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>?? ? ????????? ??????? ?????? ??????? ?? ???????? ???????? ?? ???? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>?? ? ????????? ?? ?? ????????? ???? ???????? ??????? ? ???? ?? ?????? ?? ????????, ???????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>?? ? ????????? ???????, ???????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>?????? ??? ????????? ?? ???????? ?? ??????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation type="unfinished"/>
</message>
@@ -4206,38 +4318,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>?????????? ?? ???????? ?? ???????</translation>
</message>
@@ -4255,12 +4367,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4317,6 +4423,12 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4334,39 +4446,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>?????? ?? ?? ??????? ?????????? %1, ??????: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>?????????? %1, ?????????? ?? ???????</translation>
</message>
@@ -4379,14 +4491,14 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4394,49 +4506,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>?????????? %1, ?????????? ?? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>????????? ???????????? ?? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4493,39 +4605,39 @@
<translation>?????? ?? ?? ??????? %1 ?? %2, ??????: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>?????????? %1, ?????????? ?? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>???????? ???????? ?? ???????? HTTP ???. ???????? ??????? 201, ?? ???????? ???????? ?? "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>?????? ??? ?????????? ?? ???????????? ?? ?????? ?? ????????</translation>
</message>
@@ -4533,22 +4645,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4556,11 +4657,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>????????? ???????? (????????? ???????????) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
@@ -4590,6 +4686,22 @@
<source>The file %1 is currently in use</source>
<translation>?????????? %1, ?????????? ?? ???????</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>????????? ???????? (????????? ???????????) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4838,6 +4950,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>???????? ????? ?? ???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>????? ?? ???????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>??????? ???????? ???? ????? ?-????? ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>??????? ???????? ???? ?? ????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4870,43 +5008,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>?????? ???? ???????? ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>???????? ????? ?? ???</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>????? ?? ???????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>??????? ???????? ???? ?? ????????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>??????? ???????? ???? ????? ?-????? ...</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4922,11 +5034,6 @@
<translation>???????? ??????????? ?? ???? ????? ?? ? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>??????? ????????? ????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -4953,12 +5060,6 @@
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>?????? ?? ???????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>???? ???????? ...</translation>
@@ -4988,6 +5089,17 @@
<source>Delete</source>
<translation>???????</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>??????? ????????? ????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>?????? ?? ???????????</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5089,13 +5201,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>???? ????? ?? ? ???????? ? ?? ? ??????????.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>??????? ?? ????????: %1</translation>
@@ -5115,6 +5220,13 @@
<source>The connection is not secure</source>
<translation>??????????? ?? ? ????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>???? ????? ?? ? ???????? ? ?? ? ??????????.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5207,23 +5319,24 @@
<translation>%1 (??????????? ?????? ????????? ??????, ???????? ???? ?? %2)</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="383"/>
- <source>Could not update file: %1</source>
- <translation>?????? ?? ?? ??????? ??????????: %1</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>???????? ? %1, ???????? ? %2 ?? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="412"/>
- <source>Could not update virtual file metadata: %1</source>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="419"/>
- <source>Could not update file metadata: %1</source>
- <translation type="unfinished"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>??? ????? ??????? ?? ??????: ??????????? ?? ??????? ?? ????????? ?? ?????? ?? ?????? ??? %1 ?????? ??? ?? ???????????.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="433"/>
- <source>Could not set file record to local DB: %1</source>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -5232,14 +5345,23 @@
<translation>?????????? ????????.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>???????? ? %1, ???????? ? %2 ?? ???????</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="383"/>
+ <source>Could not update file: %1</source>
+ <translation>?????? ?? ?? ??????? ??????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="412"/>
+ <source>Could not update virtual file metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="419"/>
+ <source>Could not update file metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="433"/>
+ <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/>
</message>
<message>
@@ -5262,16 +5384,6 @@
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>??? ????? ??????? ?? ??????: ??????????? ?? ??????? ?? ????????? ?? ?????? ?? ?????? ??? %1 ?????? ??? ?? ???????????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5282,7 +5394,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5666,11 +5778,6 @@
<source>Less than a minute</source>
<translation>??????? ?? ???? ??????</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5678,20 +5785,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5706,6 +5803,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5848,6 +5960,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>?? ?????? ???????? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>???? ????????? ????? ?? ??????????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>???????? ?? %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>??????????? ??????? ?? ????????</translation>
@@ -5868,31 +5995,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>???????? ?? %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>???????? ?? ????????:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>?????? %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>?? ?????? ???????? ??</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>?????????????? ?? ???????? ? ????????????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5914,11 +6016,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>???? ????????? ????? ?? ??????????????.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation type="unfinished"/>
@@ -5929,6 +6026,21 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>???????? ?? ????????:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>?????? %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>?????????????? ?? ???????? ? ????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5937,11 +6049,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&??????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>?????????? ???</translation>
@@ -5977,22 +6084,11 @@
<translation>?????? ?? ???? ?? ?? ?????????????? ????? ???????? ??</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>?????? ?? ???? ?? ?? ?????????????? ?????????? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>???????? ??? ?? ?? ????????????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>?????? ?? ?????????? ?? ?????????</translation>
@@ -6007,6 +6103,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>??????? ?? ????????? ????? ? ??????? ????? ?????????????? ?? ??????</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>???????? ??? ?? ?? ????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&??????? ?????</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6047,6 +6159,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>?? ??????</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>????</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>???? ????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6087,57 +6244,12 @@
<source>Synced %1</source>
<translation>?????????????? %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>?? ??????</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>????</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>???? ????? ?????</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6383,6 +6495,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>?????? ?? ????????? ????? "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>?????? ?? ???????? ????? "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6572,16 +6727,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6596,6 +6741,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6829,16 +6984,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>?????????? ?? ??????????????</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>?????????? ?? ??????????????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>???????????????? ? ?????????</translation>
@@ -6897,4 +7052,17 @@
<translation>?????????? ??????? ?? ????????? ????</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_nb_NO.ts nextcloud-desktop-3.16.6/translations/client_nb_NO.ts
--- nextcloud-desktop-3.16.4/translations/client_nb_NO.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_nb_NO.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>Aktiver hurtigsynkronisering</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>Rask synkronisering vil bare synkronisere endringer i filer og mapper i mapper som har blitt utforsket. Dette kan ?ke responsen betydelig ved f?rste konfigurasjon av virtuelle filer. Det vil imidlertid f?re til overfl?dige nedlastinger av filer som flyttes til en uutforsket mappe. </translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>Aktiver virtuelle filer</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -557,7 +549,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Eldre import</translation>
</message>
@@ -572,7 +564,7 @@
<translation>Hopp over</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>Kunne ikke importere kontoer fra eldre klientkonfigurasjon.</translation>
</message>
@@ -580,33 +572,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Lagringsplass: ?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Umarkerte mapper vil bli <b>fjernet</b> fra ditt lokale filsystem og vil ikke bli synkronisert med denne maskinen lenger</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Avbryt</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Bruk</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Tilkoblet <server> som <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Synkroniser alle</translation>
@@ -637,6 +607,33 @@
<translation>Innstillinger for tilkobling</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Bruk</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Lagringsplass: ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Avbryt</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Tilkoblet <server> som <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Ingen konto konfigurert.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>End-to-end-kryptering med virtuelle filer</translation>
@@ -671,9 +668,9 @@
<b>Denne prosessen kan ikke reverseres. Er du sikker p? at du vil fortsette?</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Ingen konto konfigurert.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -686,6 +683,11 @@
<translation>Vis mnemonic</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>End-to-end-kryptering er aktivert for denne kontoen</translation>
@@ -711,6 +713,12 @@
<translation>Mappen har en synkroniseringsfeil. Kryptering av denne mappen vil v?re mulig n?r den har synkronisert vellykket</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -735,12 +743,6 @@
<translation>Kunne ikke kryptere mappen fordi mappen ikke eksisterer lengre</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>?pne mappe</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Krypter</translation>
@@ -779,16 +781,6 @@
<translation>Synkroniser p? ny</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Fortsett synkronisering</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Sett synkronisering p? pause</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Fjern tilkobling for synkronisering av mappe</translation>
@@ -814,21 +806,11 @@
<translation>Oppretting av mappe feilet</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Kunne ikke opprette lokal mappe <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Bekreft fjerning av tilkobling for synkronisering av mappe</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Vil du virkelig stoppe synkronisering av mappen <i>%1</i>?</p><p><b>Merk:</b> Dette vil <b>ikke</b> slette noen filer.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Fjern tilkobling for mappe-synkronisering</translation>
@@ -862,24 +844,24 @@
<translation>End-to-end kryptering mnemonic</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>For ? beskytte din kryptografiske identitet, krypterer vi den med en mnemonikk med 12 ordbokord. Vennligst noter disse ned og oppbevar dem trygt. De vil v?re n?dvendige for ? legge til andre enheter p? kontoen din (som mobiltelefonen eller den b?rbare datamaskinen).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>Deaktiver ende-til-ende-kryptering</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>Vil du deaktivere ende-til-ende-kryptering for %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>Fjerning av ende-til-ende-kryptering vil fjerne lokalt synkroniserte filer som er kryptert.<br>Krypterte filer forblir p? serveren.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -892,34 +874,44 @@
<translation>Synkronisering kj?rer.<br/>Vil du avbryte den?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) av %2 i bruk. Noen mapper, inkludert nettverkstilkoblede eller delte mapper, kan ha andre begrensninger.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 i bruk</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 av %2 i bruk</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Ingen informasjon om bruk av lagringsplass tilgjengelig for ?yeblikket.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>Det er mapper som har vokst i st?rrelse utover %1MB: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 i bruk</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 som %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>Ende-til-ende-kryptering er aktivert p? denne kontoen med en annen enhet.<br>Den kan aktiveres p? denne enheten ved ? angi mnemonikken din.<br>Dette vil aktivere synkronisering av eksisterende krypterte mapper.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>Tjenerversjon %1 er utdatert og ikke st?ttet! Fortsett p? egen risiko!</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Sett opp kryptering</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Denne kontoen st?tter ende-til-ende kryptering</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -937,79 +929,125 @@
<translation>Server %1 er for ?yeblikket i vedlikeholdsmodus.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>Server %1 blir for ?yeblikket omdirigert, eller tilkoblingen din er bak en captive portal.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Logget ut fra %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Kobler til %1 ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Noen mapper ble ikke synkronisert fordi de er for store</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>Ikke i stand til ? koble til %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Noen mapper ble ikke synkronisert fordi de er eksterne lagringsplasser:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Server konfigurasjons-feil: %1 ved %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Noen mapper ble ikke synkronisert fordi de er for store eller de er eksterne lagringsplasser:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>?pne mappe</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Ingen %1-forbindelse konfigurert.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Fortsett synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Sett synkronisering p? pause</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Noen mapper ble ikke synkronisert fordi de er for store</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Kunne ikke opprette lokal mappe <i>%1</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Noen mapper ble ikke synkronisert fordi de er eksterne lagringsplasser:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Vil du virkelig stoppe synkronisering av mappen <i>%1</i>?</p><p><b>Merk:</b> Dette vil <b>ikke</b> slette noen filer.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Noen mapper ble ikke synkronisert fordi de er for store eller de er eksterne lagringsplasser:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>For ? beskytte din kryptografiske identitet, krypterer vi den med en mnemonikk med 12 ordbokord. Vennligst noter disse ned og oppbevar dem trygt. De vil v?re n?dvendige for ? legge til andre enheter p? kontoen din (som mobiltelefonen eller den b?rbare datamaskinen).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>Det er mapper som har vokst i st?rrelse utover %1MB: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>Deaktiver ende-til-ende-kryptering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>Ende-til-ende-kryptering er aktivert p? denne kontoen med en annen enhet.<br>Den kan aktiveres p? denne enheten ved ? angi mnemonikken din.<br>Dette vil aktivere synkronisering av eksisterende krypterte mapper.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>Vil du deaktivere ende-til-ende-kryptering for %1?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Denne kontoen st?tter ende-til-ende kryptering</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>Fjerning av ende-til-ende-kryptering vil fjerne lokalt synkroniserte filer som er kryptert.<br>Krypterte filer forblir p? serveren.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Sett opp kryptering</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) av %2 i bruk. Noen mapper, inkludert nettverkstilkoblede eller delte mapper, kan ha andre begrensninger.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 av %2 i bruk</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Ingen informasjon om bruk av lagringsplass tilgjengelig for ?yeblikket.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 som %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>Tjenerversjon %1 er utdatert og ikke st?ttet! Fortsett p? egen risiko!</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>Server %1 blir for ?yeblikket omdirigert, eller tilkoblingen din er bak en captive portal.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Kobler til %1 ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>Ikke i stand til ? koble til %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Server konfigurasjons-feil: %1 ved %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Ingen %1-forbindelse konfigurert.</translation>
</message>
</context>
<context>
@@ -1124,11 +1162,6 @@
<translation>Sertifikat & n?kkel (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Bla...</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Passord for sertifikatet:</translation>
@@ -1139,6 +1172,11 @@
<translation>En kryptert pkcs12 pakke er sterkt anbefalt for ? lagre en kopi i konfigurasjons fil.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Bla...</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Velg et sertifikat</translation>
@@ -1189,34 +1227,34 @@
<translation>Fortsett</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 kontoer</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 konto</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 mapper</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 mappe</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Eldre import</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1224,12 +1262,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Feil ved lesing av konfigurasjonsfil</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>Det oppsto en feil under tilgang til konfigurasjonsfilen p? %1. S?rg for at filen er tilgjengelig for systemkontoen din.</translation>
</message>
@@ -1271,6 +1309,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1278,6 +1355,11 @@
<translation>Filen %1 kan ikke lastes opp fordi det finnes en annen fil med samme navn, som bare avviker i tilfelle</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Filen %1 har ugyldig endret tid. Ikke last opp til serveren.</translation>
@@ -1482,7 +1564,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Feil ved skriving av metadata til databasen</translation>
</message>
@@ -1612,21 +1694,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Vil du slette katalogen <i>%1</i> og alt innholdet permanent?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Vil du slette filen <i>%1</i> permanent?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Bekreft sletting</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1642,30 +1709,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Ingen Nextcloud-konto konfigurert</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Vil du slette katalogen <i>%1</i> og alt innholdet permanent?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Autentiseringsfeil: Bruker navn eller passord er feil.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Vil du slette filen <i>%1</i> permanent?</translation>
</message>
<message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Bekreft sletting</translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
+ <message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Tidsavbrudd</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Oppgitt p?loggingsinformasjon er feil</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>Den konfigurerte serveren for denne klienten er for gammel</translation>
@@ -1675,16 +1742,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Vennligst oppdatert til den nyeste serveren og start klienten p? nytt.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Autentiseringsfeil: Bruker navn eller passord er feil.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Ingen Nextcloud-konto konfigurert</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Oppgitt p?loggingsinformasjon er feil</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Feil under avbryting av sletting av en fil</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>Feil under avbryting av sletting av %1</translation>
</message>
@@ -1692,19 +1774,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Serverfeil: PROPFIND-svaret er ikke XML-formatert!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>Feil ved oppsett av kryptert metadata!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1712,27 +1794,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Feil under ?pning av katalogen %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Katalog ikke tilgjengelig p? klient, tillatelse nektet</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Mappe ikke funnet: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>Filnavn koding er ikke gyldig</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Kunne ikke lese mappen %1</translation>
</message>
@@ -1972,11 +2054,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>Polling-URLen starter ikke med HTTPS til tross for at p?loggings-URLen startet med HTTPS. P?logging vil ikke v?re mulig fordi dette kan v?re et sikkerhetsproblem. Kontakt administratoren din.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>Den returnerte server-URLen starter ikke med HTTPS til tross for p?loggings-URLen startet med HTTPS. P?logging vil ikke v?re mulig fordi dette kan v?re et sikkerhetsproblem. Kontakt administratoren din.</translation>
@@ -1988,28 +2065,33 @@
<translation>Feil i retur fra server: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>Polling-URLen starter ikke med HTTPS til tross for at p?loggings-URLen startet med HTTPS. P?logging vil ikke v?re mulig fordi dette kan v?re et sikkerhetsproblem. Kontakt administratoren din.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Det oppsto en feil ved tilgang til "token"-endepunktet: <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Kunne ikke analysere JSON-en som ble returnert fra serveren: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>Svaret fra serveren inneholdt ikke alle forventede felt</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Kunne ikke analysere JSON-en som ble returnert fra serveren: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2052,6 +2134,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 har blitt fjernet.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 har blitt oppdatert.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 har blitt omd?pt til %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 har blitt flyttet til %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2067,17 +2177,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 og %n annen fil har blitt fjernet.</numerusform><numerusform>%1 og %n andre filer har blitt fjernet.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 har blitt fjernet.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 og %n andre fil(er) er lagt til.</numerusform><numerusform>%1 og %n andre fil(er) er lagt til.</numerusform></translation>
@@ -2093,33 +2192,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 og %n annen fil har blitt oppdatert.</numerusform><numerusform>%1 og %n andre filer har blitt oppdatert.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 har blitt oppdatert.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 er blitt omd?pt til %2 og %n annen fil har blitt omd?pt.</numerusform><numerusform>%1 er blitt omd?pt til %2 og %n andre filer har blitt omd?pt.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 har blitt omd?pt til %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 er blitt flyttet til %2 og %n annen fil har blitt flyttet.</numerusform><numerusform>%1 er blitt flyttet til %2 og %n andre filer har blitt flyttet.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 har blitt flyttet til %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2156,67 +2238,67 @@
<translation>Synkroniseringsaktivitet</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Klarte ikke ? lese systemets ekskluderingsfil</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>En ny mappe st?rre enn %1 MB er blitt lagt til: %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>En mappe fra et eksternt lager er blitt lagt til.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>G? til Innstillinger og velg den hvis du ?nsker ? laste den ned.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>En mappe har overskredet den angitte mappest?rrelsesgrensen p? %1MB: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>Fortsett ? synkronisere</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>Stopp synkroniseringen</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>Mappen %1 har overskredet den angitte mappest?rrelsesgrensen p? %2MB.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>Vil du slutte ? synkronisere denne mappen?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Mappen %1 ble opprettet, men ble ekskludert fra synkronisering tidligere. Data inne i den vil ikke bli synkronisert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Filen %1 ble opprettet, men ble ekskludert fra synkronisering tidligere. Det vil ikke bli synkronisert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2229,41 +2311,41 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>Virtuell nedlasting av filen feilet med kode "%1", status "%2" og feilmelding "%3"</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>Fjerne alle filer?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2304,11 +2386,6 @@
<translation>Klarte ikke ? tilbakestille mappetilstand</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>En gammel synkroniseringsjournal ?%1? ble funnet, men kunne ikke fjernes. S?rg for at ingen applikasjoner bruker den for ?yeblikket.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation> (sikkerhetskopi)</translation>
@@ -2319,6 +2396,11 @@
<translation> (sikkerhetskopi %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>En gammel synkroniseringsjournal ?%1? ble funnet, men kunne ikke fjernes. S?rg for at ingen applikasjoner bruker den for ?yeblikket.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Udefinert tilstand.</translation>
@@ -2389,16 +2471,6 @@
<translation>Synkroniseringsforesp?rsel ble kansellert.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Synkronisering er satt p? pause.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (Synkronisering er satt p? pause)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2445,6 +2517,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Synkronisering er satt p? pause.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (Synkronisering er satt p? pause)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2488,16 +2570,6 @@
<translation>Feil ved innlasting av listen av mapper fra serveren.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Henter mappeliste fra server ?</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Det finnes ul?ste konflikter. Klikk for detaljer.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>St?tte for virtuelle filer er aktivert.</translation>
@@ -2539,16 +2611,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>Nedlasting %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>Fil %1 av %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Det finnes ul?ste konflikter. Klikk for detaljer.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>Nedlasting %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Henter mappeliste fra server ?</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2595,21 +2682,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 av %2, fil %3 av %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>Fil %1 av %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>Venter p? %n annen(e) mappe(r) ?</numerusform><numerusform>Venter p? %n annen(e) mappe(r) ?</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>I ferd med ? starte synkroniseringen</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>Venter p? %n annen(e) mappe(r) ?</numerusform><numerusform>Venter p? %n annen(e) mappe(r) ?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2769,11 +2851,6 @@
<translation>Vanlige innstillinger</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Start n?r maskinen starter</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>Vis anropsvarsler</translation>
@@ -2784,11 +2861,6 @@
<translation>For systemkurven</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Bruk svart/&hvite ikoner</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2804,17 +2876,32 @@
<translation>Avansert</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Be om bekreftelse f?r du synkroniserer nye mapper st?rre enn</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Be om bekreftelse f?r synkronisering av eksterne lagre</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Start n?r maskinen starter</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Bruk svart/&hvite ikoner</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Be om bekreftelse f?r du synkroniserer nye mapper st?rre enn</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>Varsle n?r synkroniserte mapper vokser seg st?rre enn spesifisert grense</translation>
@@ -2825,11 +2912,6 @@
<translation>Deaktiver automatisk synkronisering av mapper som overvinner grensen</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Be om bekreftelse f?r synkronisering av eksterne lagre</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>Flytt fjernede filer til papirkurven</translation>
@@ -2881,11 +2963,6 @@
<translation>Oppdateringskanal</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Omstart && Oppdater</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>&se etter oppdateringer automatisk</translation>
@@ -2906,6 +2983,16 @@
<translation>Juridiske merknader</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Omstart && Oppdater</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Servervarsler som krever oppmerksomhet.</translation>
@@ -2926,6 +3013,11 @@
<translation>Du kan ikke deaktivere autostart fordi systemomfattende autostart er aktivert.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>stabil</translation>
@@ -3000,6 +3092,11 @@
<source>Debug archive is created at %1</source>
<translation>Feils?kingsarkivet er opprettet p? %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3164,102 +3261,97 @@
<translation>Nytt filnavn</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Endre navn p? fil</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>Filen "%1" kunne ikke synkroniseres fordi navnet inneholder tegn som ikke er tillatt p? dette systemet.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>F?lgende tegn er ikke tillatt p? systemet: * " | & ? , ; : \ / ~ < > innledende/etterf?lgende mellomrom</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>Filen "%1" kunne ikke synkroniseres fordi navnet inneholder tegn som ikke er tillatt p? serveren.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>F?lgende tegn er ikke tillatt: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>F?lgende basenavn er ikke tillatt: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>F?lgende filnavn er ikke tillatt: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>F?lgende filutvidelser er ikke tillatt: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Kontrollerer ? gi nytt navn ?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>Du har ikke tillatelse til ? gi nytt navn til denne filen. Be forfatteren av filen om ? gi den et nytt navn.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>Kunne ikke hente tillatelser med feilen %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>Filnavnet inneholder innledende og etterf?lgende mellomrom.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>Filnavnet inneholder innledende mellomrom.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>Filnavnet inneholder etterf?lgende mellomrom.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>Bruk ugyldig navn</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>Filnavnet inneholder ulovlige tegn: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>Kunne ikke gi nytt navn til filen. S?rg for at du er koblet til serveren.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>Kan ikke gi nytt navn til filen fordi en fil med samme navn allerede eksisterer p? serveren. Vennligst velg et annet navn.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>Kunne ikke gi nytt navn til lokal fil. %1</translation>
</message>
@@ -3383,16 +3475,6 @@
<translation><p>En ny versjon av %1-klienten er tilgjengelig.</p><p><b>%2</b> er tilgjengelig for nedlasting. Installert versjon er %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Hopp over denne gangen</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Hent oppdatering</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>Oppdatering mislyktes</translation>
@@ -3417,6 +3499,16 @@
<source>Update manually</source>
<translation>Oppdater manuelt</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Hopp over denne gangen</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Hent oppdatering</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3441,6 +3533,23 @@
<translation>Proxy-server krever autentisering</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>B?ndbredde for nedlasting</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Begrens til</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KByte/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>Merk: proxy-innstillinger har ingen effekter for kontoer p? localhost</translation>
@@ -3463,46 +3572,29 @@
<translation>Bruk globale innstillinger</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>B?ndbredde for nedlasting</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Ingen begrensning</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KByte/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Begrens til</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Begrens til 3/4 av estimert b?ndbredde</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>B?ndbredde for opplasting</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Begrens automatisk</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>B?ndbredde for opplasting</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Vertsnavn p? proxy-server</translation>
@@ -3531,6 +3623,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>Klarte ikke ? se etter nye oppdateringer.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Sjekker oppdateringsserveren ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>Ny %1 oppdatering klar</translation>
@@ -3561,11 +3663,6 @@
<translation>Kunne ikke laste ned oppdateringen. ?pne %1 for ? laste ned oppdateringen manuelt.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>Klarte ikke ? se etter nye oppdateringer.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>Ny %1 er tilgjengelig. ?pne <a href='%2'>%2</a> for ? laste ned oppdateringen.</translation>
@@ -3576,16 +3673,21 @@
<translation>Ny %1 er tilgjengelig. ?pne %2 for ? laste ned oppdateringen.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Sjekker oppdateringsserveren ?</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Oppdateringsstatus er ukjent: Sjekket ikke for nye oppdateringer.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Ingen oppdateringer tilgjengelig. Du har den nyeste versjonen.</translation>
@@ -3761,11 +3863,6 @@
<translation><font color="green">Vellykket oppkobling mot %1: %2 versjon %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>Ugyldig URL</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Klarte ikke ? koble til %1 p? %2:<br/>%3</translation>
@@ -3776,6 +3873,16 @@
<translation>Tidsavbrudd ved oppkobling mot %1 p? %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Tilgang forbudt av serveren. For ? sjekke om du har gyldig tilgang, <a href="%1">klikk her</a> for ? aksessere tjenesten med nettleseren din.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>Ugyldig URL</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Pr?ver ? koble til %1 p? %2 ?</translation>
@@ -3786,11 +3893,6 @@
<translation>Den autentiserte foresp?rselen til serveren ble omdirigert til "%1". URL-en er d?rlig, serveren er feilkonfigurert.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Tilgang forbudt av serveren. For ? sjekke om du har gyldig tilgang, <a href="%1">klikk her</a> for ? aksessere tjenesten med nettleseren din.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>Det var et ugyldig svar p? en autentisert WebDAV-foresp?rsel</translation>
@@ -4002,62 +4104,34 @@
<translation>Filnavn som slutter med punktum st?ttes ikke p? dette filsystemet.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Mappe</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Fil</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>%1 navn som inneholder tegnet "%2" st?ttes ikke p? dette filsystemet.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>%1 navn inneholder minst ett ugyldig tegn</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>%1 navn er reservert p? dette filsystemet.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>Filnavnet inneholder minst ett ugyldig tegn</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4067,6 +4141,24 @@
<translation>Filnavnet inneholder etterf?lgende mellomrom.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Mappe</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Fil</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>%1 navn som inneholder tegnet "%2" st?ttes ikke p? dette filsystemet.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4075,6 +4167,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>%1 navn inneholder minst ett ugyldig tegn</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>%1 navn er reservert p? dette filsystemet.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>Filnavnet inneholder innledende mellomrom.</translation>
@@ -4165,64 +4267,74 @@
<translation>Server rapporterte ingen %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Kan ikke synkronisere p? grunn av ugyldig endringstid</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>Kunne ikke laste opp filen, fordi den er ?pen i "%1".</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>Feil under sletting av filpost %1 fra databasen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>Flyttet til ugyldig m?l, gjenoppretter</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorert p? grunn av svartelisten "velg hva som skal synkroniseres".</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Ikke tillatt fordi du ikke har tillatelse til ? legge til undermapper i den mappen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Ikke tillatt fordi du ikke har tillatelse til ? legge til filer i den mappen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Ikke tillatt ? laste opp denne filen fordi den er skrivebeskyttet p? serveren, gjenopprettes</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>Ikke tillatt ? fjerne, gjenopprette</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Feil under lesing av databasen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>Serveren svarte med en feil under lesing av katalogen "%1": %2</translation>
</message>
@@ -4230,38 +4342,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>Feil under oppdatering av metadata p? grunn av ugyldig endringstid</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>Mappen %1 kan ikke gj?res skrivebeskyttet: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Feil ved oppdatering av metadata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>Filen er i bruk</translation>
</message>
@@ -4279,12 +4391,6 @@
<translation>Filen %1 kan ikke lastes ned fordi krypteringsinformasjon mangler.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>Filen er endret siden den ble oppdaget</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4341,6 +4447,12 @@
<source>The file %1 is currently in use</source>
<translation>Filen %1 er i bruk</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>Filen er endret siden den ble oppdaget</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4358,39 +4470,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>klarte ikke ? slette fil %1, feil: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>Mappe %1 kan ikke opprettes p? grunn av et lokalt fil- eller mappenavn-sammenst?t!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>Kunne ikke opprette mappen %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>Mappen %1 kan ikke gj?res skrivebeskyttet: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Feil ved oppdatering av metadata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>Filen %1 er i bruk</translation>
</message>
@@ -4403,14 +4515,14 @@
<translation>Kunne ikke fjerne %1 p? grunn av lokalt sammenfall av filnavn</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Kunne ikke slette filposten %1 fra lokal DB</translation>
</message>
@@ -4418,49 +4530,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>Mappe %1 kan ikke omd?pes p? grunn av et lokalt fil- eller mappenavn-sammenst?t!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>Filen %1 ble lastet ned, men det resulterte i en lokal filnavnsammenst?t!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Feil ved innstilling av pin-status</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Feil ved oppdatering av metadata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>Filen %1 er i bruk</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>Kunne ikke spre katalogendringer i hierarkiet</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Kunne ikke gi nytt navn til filen</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Kunne ikke slette filposten %1 fra lokal DB</translation>
</message>
@@ -4517,39 +4629,39 @@
<translation>Kunne ikke endre navn p? %1 til %2, feil: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Feil ved oppdatering av metadata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>Filen %1 er i bruk</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Feil HTTP-kode returnert fra server. Ventet 201, men mottok "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Kunne ikke slette filposten %1 fra lokal DB</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Feil ved innstilling av pin-status</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Feil ved skriving av metadata til databasen</translation>
</message>
@@ -4557,22 +4669,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>Kunne ikke laste opp kryptert fil.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>Fil %1 kan ikke lastes opp fordi en annen fil eksisterer med samme navn, bare med forskjellige store og sm? bokstaver i navnet.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>Opplastingen av %1 overstiger kvoten for mappen</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4580,11 +4681,6 @@
<translation>Filen %1 har ugyldig endringstid. Ikke last opp til serveren.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Fil fjernet (start opplasting) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Lokal fil endret under synkronisering. Den vil gjenopptas.</translation>
@@ -4614,6 +4710,22 @@
<source>The file %1 is currently in use</source>
<translation>Filen %1 er i bruk</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>Opplastingen av %1 overstiger kvoten for mappen</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>Kunne ikke laste opp kryptert fil.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Fil fjernet (start opplasting) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4862,6 +4974,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Deling av kontekstmeny</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Jeg delte noe med deg</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Alternativer for deling</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Send privat lenke p? e-post...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Kopier privat lenke til utklippstavlen</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>Kunne ikke kryptere mappen "% 1"</translation>
@@ -4896,43 +5034,17 @@
<translation>F?lgende mappe ble kryptert: "% 1"</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Deling av kontekstmeny</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Velg ny plassering ?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Jeg delte noe med deg</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Alternativer for deling</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Aktivitet</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Kopier privat lenke til utklippstavlen</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Send privat lenke p? e-post...</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>Legg igjen denne delingen</translation>
@@ -4948,11 +5060,6 @@
<translation>Videredeling av denne mappen er ikke tillatt</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Kopier intern lenke</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>Krypter</translation>
@@ -4979,12 +5086,6 @@
<translation><numerusform>Utl?per om %1 minutter</numerusform><numerusform>Utl?per om %1 minutter</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>?pne i nettleser</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>L?s konflikt...</translation>
@@ -5014,6 +5115,17 @@
<source>Delete</source>
<translation>Slett</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Kopier intern lenke</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>?pne i nettleser</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5115,13 +5227,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Denne forbindelsen er IKKE sikker da den ikke er kryptert.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Tjenerversion: %1</translation>
@@ -5141,6 +5246,13 @@
<source>The connection is not secure</source>
<translation>Tilkoblingen er ikke sikker</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Denne forbindelsen er IKKE sikker da den ikke er kryptert.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5233,6 +5345,32 @@
<translation>%1 (hoppet over p? grunn av tidligere feil, pr?ver igjen om %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Bare %1 er tilgjengelig, trenger minst %2 for ? begynne</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>Kan ikke ?pne eller opprette den lokale synkroniseringsdatabasen. S?rg for at du har skrivetilgang i synkroniseringsmappen.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Det er lite diskplass: Nedlastinger som ville redusere ledig plass under %1 ble hoppet over.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>Det er ikke nok plass p? serveren for enkelte opplastinger.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Ul?st konflikt</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>Kunne ikke oppdatere filen: %1</translation>
@@ -5253,22 +5391,6 @@
<translation>Kunne ikke sette filposten til lokal DB: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Ul?st konflikt</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Bare %1 er tilgjengelig, trenger minst %2 for ? begynne</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>Kan ikke ?pne eller opprette den lokale synkroniseringsdatabasen. S?rg for at du har skrivetilgang i synkroniseringsmappen.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Bruker virtuelle filer med suffiks, men suffiks er ikke angitt</translation>
@@ -5288,16 +5410,6 @@
<source>Cannot open the sync journal</source>
<translation>Kan ikke ?pne synkroniseringsjournalen</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Det er lite diskplass: Nedlastinger som ville redusere ledig plass under %1 ble hoppet over.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>Det er ikke nok plass p? serveren for enkelte opplastinger.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5308,7 +5420,7 @@
<translation>Frakoblet</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5692,11 +5804,6 @@
<source>Less than a minute</source>
<translation>Mindre enn ett minutt</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5704,20 +5811,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5732,6 +5829,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5874,6 +5986,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Vennligst logg inn</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>Ingen synkroniseringsmapper er konfigurert.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Koble fra %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Server-versjonen st?ttes ikke</translation>
@@ -5894,31 +6021,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Koble fra %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Koblet fra kontoer:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Konto %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Vennligst logg inn</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Kontosynkronisering er deaktivert</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5940,11 +6042,6 @@
<translation>macOS VFS for %1: Et problem oppstod.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>Ingen synkroniseringsmapper er konfigurert.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Ser etter endringer i fjernkontrollen "% 1"</translation>
@@ -5955,6 +6052,21 @@
<translation>Ser etter endringer i lokale ?%1?</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Koblet fra kontoer:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Konto %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Kontosynkronisering er deaktivert</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5963,11 +6075,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Lokal mappe</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Brukernavn</translation>
@@ -6003,22 +6110,11 @@
<translation>Sp?r f?r du synkroniserer mapper st?rre enn</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Sp?r f?r du synkroniserer eksterne lagringer</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Velg hva som synkroniseres</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Behold lokale data</translation>
@@ -6033,6 +6129,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Slett lokal mappe og start en ren synkronisering</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Velg hva som synkroniseres</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Lokal mappe</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6073,6 +6185,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>fram i tid</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1m</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>n?</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>For en stund siden</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6113,57 +6270,12 @@
<source>Synced %1</source>
<translation>Synkronisert %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>fram i tid</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>n?</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1m</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>For en stund siden</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>Baner som begynner med '#'-tegnet st?ttes ikke i VFS-modus.</translation>
@@ -6409,6 +6521,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>?pne lokale mapper eller gruppemapper</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>?pne lokal mappe</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Tilkoblet</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>Koblet fra</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>?pne den lokale mappen ?% 1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>?pne gruppemappen ?% 1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>?pne %1 i filutforsker</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>Meny for brukergruppe og lokale mapper</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6598,16 +6753,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6622,6 +6767,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6855,16 +7010,16 @@
<translation>Feil oppstod under oppsett</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Forbereder synkronisering</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>Stopper synkroniseringen</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Forbereder synkronisering</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Synkronisering er satt p? pause</translation>
@@ -6923,4 +7078,17 @@
<translation>Frigj?r lokal plass</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>Aktiver hurtigsynkronisering</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>Rask synkronisering vil bare synkronisere endringer i filer og mapper i mapper som har blitt utforsket. Dette kan ?ke responsen betydelig ved f?rste konfigurasjon av virtuelle filer. Det vil imidlertid f?re til overfl?dige nedlastinger av filer som flyttes til en uutforsket mappe. </translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_nl.ts nextcloud-desktop-3.16.6/translations/client_nl.ts
--- nextcloud-desktop-3.16.4/translations/client_nl.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_nl.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>Snelle sync inschakelen</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>Snelle synchronisatie synchroniseert alleen wijzigingen in bestanden en mappen binnen mappen die zijn verkend. Dit kan de reactiesnelheid bij de eerste configuratie van virtuele bestanden aanzienlijk verbeteren. Het zal echter leiden tot overbodige downloads van bestanden die verplaatst zijn naar een niet verkende map.</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>Virtuele bestanden inschakelen</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Legacy import</translation>
</message>
@@ -570,7 +562,7 @@
<translation>Overslaan</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>Kon geen accounts importeren van legacy client configuratie.</translation>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Opslagruimte: ...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Niet-geselecteerde mappen worden <b>verwijderd</b> van je lokale bestandssysteem en zullen niet meer met deze computer worden gesynchroniseerd</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Annuleren</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Toepassen</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Verbonden met <server> als <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Alles synchroniseren</translation>
@@ -635,6 +605,33 @@
<translation>Verbindingsinstellingen</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Toepassen</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Opslagruimte: ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Annuleren</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Verbonden met <server> als <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Geen account ingesteld.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>End-to-end versleuteling met virtuele bestanden</translation>
@@ -669,9 +666,9 @@
<b>Deze actie is onomkeerbaar. Weet je het zeker?</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Geen account ingesteld.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -684,6 +681,11 @@
<translation>Geheugensteun weergeven</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>Begin-tot-eind versleuteling is ingeschakeld voor dit account</translation>
@@ -709,6 +711,12 @@
<translation>De map heeft een synchronisatiefout. Versleuteling van de map is mogelijk als de synchronisatie gelukt is.</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -732,12 +740,6 @@
<translation>Kon map niet versleutelen omdat de map niet meer bestaat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Map openen</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Versleutelen</translation>
@@ -776,16 +778,6 @@
<translation>Synchronisatie herstarten</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Synchronisatie hervatten</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Synchronisatie pauzeren</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Verwijder verbinding voor mapsynchronisatie</translation>
@@ -811,21 +803,11 @@
<translation>Map maken mislukt</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Kan lokale map <i>%1</i> niet maken.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Bevestig het verwijderen van de verbinding voor mapsynchronisatie</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Weet je zeker dat je het synchroniseren van map <i>%1</i> wilt stoppen?</p><p><b>Opmerking:</b> Dit zal <b>geen</b> bestanden verwijderen.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Verwijder verbinding voor mapsynchronisatie</translation>
@@ -859,24 +841,24 @@
<translation>Geheugensteun voor begin-tot-eind versleuteling</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>Om je cryptografische identiteit te beschermen, versleutelen we die met een geheugensteun van 12 woordenboekwoorden. Schrijf deze op en bewaar ze op een veilige plek. Ze zijn nodig om nieuwe apparaten aan je account toe te voegen (zoals je smartphone of laptop).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>Begin-tot-eind versleuteling uitzetten</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>Begin-tot-eind versleuteling uitzetten voor %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>Verwijderen van begin-tot-eind versleuteling zal de lokale gesynchroniseerde bestanden verwijderen die versleuteld zijn.<br>Versleutelde bestanden blijven aanwezig op de server.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -889,34 +871,44 @@
<translation>Bezig met synchroniseren.<br/>Wil je stoppen met synchroniseren?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) van %2 in gebruik. Sommige mappen, inclusief netwerkmappen en gedeelde mappen, kunnen andere limieten hebben.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 in gebruik</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 van %2 in gebruik</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Er is nu geen informatie over het gebruik van de opslagruimte beschikbaar.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>Er zijn bestanden die groter zijn geworden dan %1MB: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 in gebruik</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 als %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>Begin-tot-eind versleuteling is ingesteld voor dit account op een ander apparaat.<br>Het kan aangezet worden op dit apparaat door je geheugensteun in te voeren.<br>Dit activeert de synchronisatie van bestaande, versleutelde mappen.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>De serverversie %1 wordt niet ondersteund! Verdergaan is op eigen risico.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Versleuteling instellen</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Dit account ondersteunt end-to-end-versleuteling</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -934,79 +926,125 @@
<translation>Server %1 is momenteel in onderhoudsmodus.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>Server %1 wordt momenteel doorgestuurd of je verbinding zit achter een 'captive portal'.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Uitgelogd van %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Verbinden met %1 ...</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Er zijn mappen die niet gesynchroniseerd zijn, omdat ze te groot zijn:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>Kan niet verbinden met %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Er zijn mappen die niet gesynchroniseerd zijn, omdat ze op externe opslag staan:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Serverconfiguratiefout: %1 op %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Er zijn mappen die niet gesynchroniseerd zijn, omdat ze te groot zijn of op externe opslag staan:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Map openen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Geen %1 connectie geconfigureerd.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Synchronisatie hervatten</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Synchronisatie pauzeren</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Er zijn mappen die niet gesynchroniseerd zijn, omdat ze te groot zijn:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Kan lokale map <i>%1</i> niet maken.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Er zijn mappen die niet gesynchroniseerd zijn, omdat ze op externe opslag staan:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Weet je zeker dat je het synchroniseren van map <i>%1</i> wilt stoppen?</p><p><b>Opmerking:</b> Dit zal <b>geen</b> bestanden verwijderen.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Er zijn mappen die niet gesynchroniseerd zijn, omdat ze te groot zijn of op externe opslag staan:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>Om je cryptografische identiteit te beschermen, versleutelen we die met een geheugensteun van 12 woordenboekwoorden. Schrijf deze op en bewaar ze op een veilige plek. Ze zijn nodig om nieuwe apparaten aan je account toe te voegen (zoals je smartphone of laptop).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>Er zijn bestanden die groter zijn geworden dan %1MB: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>Begin-tot-eind versleuteling uitzetten</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>Begin-tot-eind versleuteling is ingesteld voor dit account op een ander apparaat.<br>Het kan aangezet worden op dit apparaat door je geheugensteun in te voeren.<br>Dit activeert de synchronisatie van bestaande, versleutelde mappen.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>Begin-tot-eind versleuteling uitzetten voor %1?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Dit account ondersteunt end-to-end-versleuteling</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>Verwijderen van begin-tot-eind versleuteling zal de lokale gesynchroniseerde bestanden verwijderen die versleuteld zijn.<br>Versleutelde bestanden blijven aanwezig op de server.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Versleuteling instellen</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) van %2 in gebruik. Sommige mappen, inclusief netwerkmappen en gedeelde mappen, kunnen andere limieten hebben.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 van %2 in gebruik</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Er is nu geen informatie over het gebruik van de opslagruimte beschikbaar.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 als %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>De serverversie %1 wordt niet ondersteund! Verdergaan is op eigen risico.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>Server %1 wordt momenteel doorgestuurd of je verbinding zit achter een 'captive portal'.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Verbinden met %1 ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>Kan niet verbinden met %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Serverconfiguratiefout: %1 op %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Geen %1 connectie geconfigureerd.</translation>
</message>
</context>
<context>
@@ -1121,11 +1159,6 @@
<translation>Certificaat & Sleutel (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Bladeren ...</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Wachtwoord certificaat:</translation>
@@ -1136,6 +1169,11 @@
<translation>Een versleutelde pkcs12-bundel wordt sterk aanbevolen, aangezien er een kopie wordt opgeslagen in het configuratiebestand.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Bladeren ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Selecteer een certificaat</translation>
@@ -1186,34 +1224,34 @@
<translation>Doorgaan</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 accounts</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 account</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 mappen</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 map</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Legacy import</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1221,12 +1259,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Fout bij benaderen configuratiebestand</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>Fout bij het benaderen van het configuratiebestand op %1. Zorg ervoor dat het bestand door je systeemaccount kan worden benaderd.</translation>
</message>
@@ -1268,6 +1306,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1275,6 +1352,11 @@
<translation>Bestand %1 kan niet worden ge?pload omdat er al een ander bestand met dezelfde naam bestaat, al verschillen hoofd/kleine letters</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Bestand %1 heeft een ongeldige wijzigingstijd. Niet uploaden naar de server.</translation>
@@ -1479,7 +1561,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Fout bij schrijven van metadata naar de database</translation>
</message>
@@ -1609,21 +1691,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Wil je de map <i>%1</i>met gehele inhoud permanent verwijderen?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Wil je het bestand <i>%1</i>permanent verwijderen?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Bevestig verwijderen</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1639,30 +1706,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Geen Nextcloud-account geconfigureerd</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Wil je de map <i>%1</i>met gehele inhoud permanent verwijderen?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Authenticatiefout: Gebruikersnaam of wachtwoord onjuist.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Wil je het bestand <i>%1</i>permanent verwijderen?</translation>
</message>
<message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Bevestig verwijderen</translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
+ <message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Time-out</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>De verstrekte inloggegevens zijn niet juist</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>De voor dit programma ingestelde server is te oud</translation>
@@ -1672,16 +1739,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Werk de server bij naar de nieuwste versie en herstart het programma.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Authenticatiefout: Gebruikersnaam of wachtwoord onjuist.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Geen Nextcloud-account geconfigureerd</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>De verstrekte inloggegevens zijn niet juist</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Fout bij het annuleren van verwijdering van een bestand</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>Fout bij annuleren verwijderen van %1</translation>
</message>
@@ -1689,19 +1771,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Serverfout: PROPFIND-antwoord heeft geen XML-opmaak!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>Fout bij instellen versleutelde metadata!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1709,27 +1791,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Fout bij het openen van map %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Map niet toegankelijk op client, toegang geweigerd</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Map niet gevonden: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>Bestandsnaamcodering is niet geldig</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Fout tijdens lezen van map %1</translation>
</message>
@@ -1969,11 +2051,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>De polling-URL begint niet met HTTPS, ondanks dat de login-URL met HTTPS begint. Inloggen is niet mogelijk omdat dit een beveiligingsprobleem kan zijn. Neem contact op met je beheerder.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>De geretourneerde server-URL begint niet met HTTPS, ondanks dat de inlog-URL begint met HTTPS. Inloggen is niet mogelijk omdat dit een beveiligingsprobleem kan zijn. Neem contact op met je beheerder.</translation>
@@ -1985,28 +2062,33 @@
<translation>Fout gemeld door de server: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>De polling-URL begint niet met HTTPS, ondanks dat de login-URL met HTTPS begint. Inloggen is niet mogelijk omdat dit een beveiligingsprobleem kan zijn. Neem contact op met je beheerder.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Er trad een fout op bij het benaderen van het "token" endpoint: <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Kan de van de server ontvangen JSON niet verwerken: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>Het antwoord van de server bevatte niet alle verwachte velden</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Kan de van de server ontvangen JSON niet verwerken: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2049,6 +2131,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 is verwijderd.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 is bijgewerkt.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 is hernoemd naar %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 is verplaatst naar %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2064,17 +2174,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 en %n ander bestand(en) zijn verwijderd.</numerusform><numerusform>%1 en %n andere bestand(en) zijn verwijderd.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 is verwijderd.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 en %n andere bestand zijn toegevoegd.</numerusform><numerusform>%1 en %n andere bestanden zijn toegevoegd.</numerusform></translation>
@@ -2090,33 +2189,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 en %n ander bestand(en) zijn bijgewerkt.</numerusform><numerusform>%1 en %n andere bestand(en) zijn bijgewerkt.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 is bijgewerkt.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 is hernoemd naar %2 en %n ander bestand(en) is hernoemd.</numerusform><numerusform>%1 is hernoemd naar %2 en %n andere bestand(en) zijn hernoemd.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 is hernoemd naar %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 is verplaatst naar %2 en %n ander bestand(en) is verplaatst.</numerusform><numerusform>%1 is verplaatst naar %2 en %n andere bestand(en) zijn verplaatst.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 is verplaatst naar %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2153,68 +2235,68 @@
<translation>Synchronisatie-activiteit</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Kon het systeem-uitsluitingsbestand niet lezen</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Er is een nieuwe map groter dan %1 MB toegevoegd: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Er is een map op externe opslag toegevoegd.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Ga naar de instellingen om het te selecteren als u deze wilt downloaden.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>Een map is groter geworden dan de ingestelde limiet van %1MB: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>Doorgaan met synchronisatie</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>Stop synchronisatie</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>De map %1 is groter geworden dan de ingestelde limiet van %2MB</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>Wil je stoppen met het synchroniseren van deze map?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Map %1 is gecre?erd, maar eerder uitgesloten van synchronisatie. Bestanden erin worden niet gesynchroniseerd.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Bestand %1 is gecre?erd, maar eerder uitgesloten van synchronisatie. Het wordt niet gesynchroniseerd.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2227,41 +2309,41 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>Alle bestanden verwijderen?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2302,11 +2384,6 @@
<translation>Kan de beginstaat van de map niet terugzetten</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>Een oud synchronisatieverslag "%1" is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(backup)</translation>
@@ -2317,6 +2394,11 @@
<translation>(backup %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>Een oud synchronisatieverslag "%1" is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Ongedefinieerde status.</translation>
@@ -2387,16 +2469,6 @@
<translation>Synchronisatieaanvraag werd geannuleerd.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Synchronisatie gepauzeerd.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (Synchronisatie onderbroken)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2443,6 +2515,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Synchronisatie gepauzeerd.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (Synchronisatie onderbroken)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2487,16 +2569,6 @@
<translation>Fout bij ophalen mappenlijst van de server.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Mappenlijst ophalen van de server ...</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Er zijn nog niet-opgehelderde conflicten. Klik voor details.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>Virtuele bestandsondersteuning is ingeschakeld.</translation>
@@ -2538,16 +2610,31 @@
<translation>%1 %2 ...</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>Download %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>Bestand %1 van %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Er zijn nog niet-opgehelderde conflicten. Klik voor details.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>Download %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Mappenlijst ophalen van de server ...</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2594,21 +2681,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 van %2, bestand %3 van %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>Bestand %1 van %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>Wacht op %n andere map ...</numerusform><numerusform>Wacht op %n andere mappen ...</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>In afwachting van synchronisatie</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>Wacht op %n andere map ...</numerusform><numerusform>Wacht op %n andere mappen ...</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2768,11 +2850,6 @@
<translation>Algemene instellingen</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Starten bij systeemstart</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>Toon oproepmeldingen</translation>
@@ -2783,11 +2860,6 @@
<translation>Voor systeemvak</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Gebruik &monochrome pictogrammen</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2803,17 +2875,32 @@
<translation>Geavanceerd</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Vraag bevestiging voordat mappen worden gesynchroniseerd groter dan</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Vraag bevestiging voor synchronisatie van mappen op externe opslag</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Starten bij systeemstart</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>&Monochrome pictogrammen gebruiken</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Vraag bevestiging voordat mappen worden gesynchroniseerd groter dan</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>Melding als gesynchroniseerde mappen groter worden dan de opgegeven limiet</translation>
@@ -2824,11 +2911,6 @@
<translation>Synchronisatie automatisch uitschakelen van mappen die de limiet overschrijden</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Vraag bevestiging voor synchronisatie van mappen op externe opslag</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>Verplaats verwijderde bestanden naar de prullenbak</translation>
@@ -2880,11 +2962,6 @@
<translation>Bijwerkkanaal</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Herstarten && Bijwerken</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>&Controleer automatisch op updates</translation>
@@ -2905,6 +2982,16 @@
<translation>Juridische bepalingen</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Herstarten && Bijwerken</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Servermeldingen die aandacht nodig hebben.</translation>
@@ -2925,6 +3012,11 @@
<translation>Je kunt autostart niet uitschakelen omdat systeem-brede autostart is ingeschakeld.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>stabiel</translation>
@@ -2999,6 +3091,11 @@
<source>Debug archive is created at %1</source>
<translation>Debugarchief is gemaakt op %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3163,102 +3260,97 @@
<translation>Nieuwe bestandsnaam</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Bestand hernoemen</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>Het bestand %1 kan niet worden gesynchroniseerd omdat de naam tekens bevat die niet zijn toegestaan op dit systeem.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>De volgende tekens zijn niet toegestaan op dit systeem: * " | & ? , ; : \ / ~ < > spaties aan begin/eind</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>Het bestand %1 kan niet worden gesynchroniseerd omdat de naam tekens bevat die niet zijn toegestaan op dit systeem.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>De volgende tekens zijn niet toegestaan: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>De volgende basisnamen zijn niet toegestaan: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>De volgende bestandsnamen zijn niet toegestaan: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>De volgende bestandsextensies zijn niet toegestaan: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Hernoem machtigingen controleren ...</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>Je bent niet gemachtigd om dit bestand te hernoemen. Vraag de auteur van het bestand om het te hernoemen.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>Ophalen van machtigingen mislukt met fout %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>De bestandsnaam bevat spaties vooraan en achteraan.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>De bestandsnaam bevat spaties vooraan.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>De bestandsnaam bevat spaties achteraan.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>Gebruik ongeldige naam</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>Bestandsnaam bevat ongeldige tekens: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>Kan het bestand niet hernoemen. Zorg ervoor dat je verbonden bent met de server.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>Kan het bestand niet hernoemen omdat er al een bestand met dezelfde naam op de server bestaat. Kies een andere naam.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>Kan lokaal bestand niet hernoemen. %1</translation>
</message>
@@ -3382,16 +3474,6 @@
<translation><p>Er is een nieuwe versie van de %1 Client beschikbaar.</p><p><b>%2</b> is beschikbaar voor download. De ge?nstalleerde versie is %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Deze keer overslaan</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Ophalen update</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>Bijwerken mislukt</translation>
@@ -3416,6 +3498,16 @@
<source>Update manually</source>
<translation>Handmatig bijwerken</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Deze keer overslaan</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Ophalen update</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3440,6 +3532,23 @@
<translation>Proxyserver heeft verificatie nodig</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Download bandbreedte</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Beperkt tot</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>Let op: proxy-instellingen hebben geen effect voor accounts op localhost</translation>
@@ -3462,46 +3571,29 @@
<translation>Gebruik globale instellingen</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Download bandbreedte</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Geen beperking</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Beperkt tot</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Beperk tot 3/4 van de geschatte bandbreedte</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Upload bandbreedte</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Beperk automatisch</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Upload bandbreedte</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Hostnaam van proxyserver</translation>
@@ -3530,6 +3622,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>Kan niet controleren op nieuwe updates.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Controleren updateserver ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>Nieuwe %1 update is klaar</translation>
@@ -3560,11 +3662,6 @@
<translation>Kon de update niet downloaden. Open %1 om de update handmatig te downloaden.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>Kan niet controleren op nieuwe updates.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>Nieuwe %1 beschikbaar. Open <a href='%2'>%1</a> om de update te downloaden.</translation>
@@ -3575,16 +3672,21 @@
<translation>Nieuwe %1 beschikbaar. Open %2 om de update te downloaden.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Controleren updateserver ...</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Update status is onbekend: niet gecontroleerd op nieuwe updates.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Geen updates beschikbaar. Je installatie is al van de laatste versie.</translation>
@@ -3760,11 +3862,6 @@
<translation><font color="green">Succesvol verbonden met %1: %2 versie %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>Ongeldige URL</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Kon geen verbinding maken met %1 op %2:<br/>%3</translation>
@@ -3775,6 +3872,16 @@
<translation>Time-out bij verbinden met %1 op %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Toegang door server verboden. Om te verifi?ren dat je toegang mag hebben, <a href="%1">klik hier</a> om met je browser toegang tot de service te krijgen.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>Ongeldige URL</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Probeer te verbinden met %1 om %2 ...</translation>
@@ -3785,11 +3892,6 @@
<translation>De geauthentiseerde aanvraag voor de server werd omgeleid naar "%1". De URL is onjuist, de server is verkeerd geconfigureerd.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Toegang door server verboden. Om te verifi?ren dat je toegang mag hebben, <a href="%1">klik hier</a> om met je browser toegang tot de service te krijgen.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>Er is een ongeldig antwoord ontvangen op een geauthenticeerde WebDAV opvraging</translation>
@@ -4001,62 +4103,34 @@
<translation>Bestandsnamen die eindigen met een punt worden niet ondersteund door het bestandssysteem.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Map</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Bestand</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>%1 naam met teken "%2" wordt niet ondersteund door het bestandssysteem.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>%1 naam bevat op z'n minst ??n ongeldig teken</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>%1 naam is een gereserveerde naam op dit bestandssysteem.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>De bestandsnaam bevat ten minste ??n ongeldig teken</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4066,6 +4140,24 @@
<translation>De bestandsnaam bevat spaties achteraan.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Map</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Bestand</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>%1 naam met teken "%2" wordt niet ondersteund door het bestandssysteem.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4074,6 +4166,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>%1 naam bevat op z'n minst ??n ongeldig teken</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>%1 naam is een gereserveerde naam op dit bestandssysteem.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>De bestandsnaam bevat spaties vooraan.</translation>
@@ -4164,64 +4266,74 @@
<translation>Server rapporteerde nr %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Kan niet synchroniseren door ongeldig wijzigingstijdstip</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>Kan bestand niet uploaden, omdat het geopend is in "%1".</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>Fout tijdens verwijderen bestandsrecord %1 uit de database</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>Verplaatst naar ongeldig doel, herstellen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Genegeerd vanwege de "wat synchroniseren" negeerlijst</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Niet toegestaan, omdat je geen machtiging hebt om submappen aan die map toe te voegen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Niet toegestaan omdat je geen machtiging hebt om bestanden in die map toe te voegen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>Niet toegestaan om te verwijderen, herstellen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Fout bij lezen database</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>Server gaf een foutmelding bij lezen directory "%1'": %2</translation>
</message>
@@ -4229,38 +4341,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>Fout bij bijwerken metadata door ongeldige laatste wijziging datum</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>Map %1 kon niet alleen-lezen gemaakt worden: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Fout bij bijwerken metadata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>Bestand is al in gebruik</translation>
</message>
@@ -4278,12 +4390,6 @@
<translation>Bestand %1 kan niet worden gedownload, omdat crypto informatie ontbreekt.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>Het bestand is gewijzigd sinds het is gevonden</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4340,6 +4446,12 @@
<source>The file %1 is currently in use</source>
<translation>Bestand %1 is al in gebruik</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>Het bestand is gewijzigd sinds het is gevonden</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4357,39 +4469,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>kon bestand file %1 niet verwijderen, fout: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>Map %1 kan niet worden gemaakt wegens een lokaal map- of bestandsnaam conflict!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>Kon map %1 niet maken</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>Map %1 kon niet alleen-lezen gemaakt worden: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Fout bij bijwerken metadata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>Bestand %1 is al in gebruik</translation>
</message>
@@ -4402,14 +4514,14 @@
<translation>Bestand %1 kon niet worden verwijderd, omdat de naam conflicteert met een lokaal bestand</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Kon bestandsrecord %1 niet verwijderen uit de lokale DB</translation>
</message>
@@ -4417,49 +4529,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>Map %1 kan niet worden hernoemd wegens een lokaal map- of bestandsnaam conflict!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>Bestand %1 gedownload maar het resulteerde in een lokaal bestandsnaam conflict!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Fout bij instellen pin status</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Fout bij bijwerken metadata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>Bestand %1 is al in gebruik</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Kon bestand niet hernoemen</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Kon bestandsrecord %1 niet verwijderen uit de lokale DB</translation>
</message>
@@ -4516,39 +4628,39 @@
<translation>Kon niet %1 hernoemen naar %2, fout: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Fout bij bijwerken metadata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>Bestand %1 is al in gebruik</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Foutieve HTTP code ontvangen van de server. Verwacht werd 201, maar ontvangen "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Kon bestandsrecord %1 niet verwijderen uit de lokale DB</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Fout bij instellen pin status</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Fout bij schrijven van Metadata naar de database</translation>
</message>
@@ -4556,22 +4668,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>Kon versleuteld bestand niet uploaden.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>Bestand %1 kan niet worden ge?pload omdat er al een ander bestand met dezelfde naam bestaat, al verschillen hoofd/kleine letters</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>Upload van %1 overschrijdt het quotum voor de map</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4579,11 +4680,6 @@
<translation>Bestand %1 heeft een ongeldige laatste wijziging datum. Upload niet naar de server.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Bestand verwijderd (start upload) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Lokaal bestand gewijzigd gedurende sync. Wordt opnieuw meegenomen.</translation>
@@ -4613,6 +4709,22 @@
<source>The file %1 is currently in use</source>
<translation>Bestand %1 is al in gebruik</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>Upload van %1 overschrijdt het quotum voor de map</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>Kon versleuteld bestand niet uploaden.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Bestand verwijderd (start upload) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4861,6 +4973,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Contextmenu delen</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Ik deelde iets met u</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Deelopties</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Verstuur priv?link per e-mail ---</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Kopieer priv?-link naar klembord</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>Kon een map niet versleutelen in %1</translation>
@@ -4895,43 +5033,17 @@
<translation>De volgende map was succesvol versleuteld: "%1"</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Contextmenu delen</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Selecteer nieuwe locatie ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Ik deelde iets met u</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Deelopties</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Activiteit</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Kopieer priv?-link naar klembord</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Verstuur priv?link per e-mail ---</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>Verlaat deze gedeelde locatie</translation>
@@ -4939,17 +5051,12 @@
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1182"/>
<source>Resharing this file is not allowed</source>
- <translation>Verder delen van dit bestand is niet toegestaan</translation>
+ <translation>Opnieuw delen van dit bestand is niet toegestaan</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1182"/>
<source>Resharing this folder is not allowed</source>
- <translation>Verder delen van deze map is niet toegestaan</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Kopieer interne link</translation>
+ <translation>Opnieuw delen van deze map is niet toegestaan</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
@@ -4978,12 +5085,6 @@
<translation><numerusform>Vervalt over %n maanden</numerusform><numerusform>Vervalt over %1 minuut/minuten</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Openen in browser</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Oplossen conflict ...</translation>
@@ -5013,6 +5114,17 @@
<source>Delete</source>
<translation>Verwijderen</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Kopieer interne link</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Openen in browser</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5114,13 +5226,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Deze verbinding is NIET veilig, omdat deze niet versleuteld is.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Serverversie: %1</translation>
@@ -5140,6 +5245,13 @@
<source>The connection is not secure</source>
<translation>De verbinding is niet veilig</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Deze verbinding is NIET veilig, omdat deze niet versleuteld is.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5232,6 +5344,32 @@
<translation>%1 (overgeslagen wegens een eerdere fout, probeer opnieuw over %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Slechts %1 beschikbaar, maar heeft minimaal %2 nodig om te starten</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>Kon de lokale sync-database niet openen of aanmaken. Zorg ervoor dat je schrijf-toegang hebt in de sync-map</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Schijfruimte laag: Downloads die de vrije ruimte tot onder %1 zouden reduceren, zijn overgeslagen.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>Onvoldoende schijfruimte op de server voor sommige uploads.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Bestandsconflict</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>Kon bestand niet bijwerken: %1</translation>
@@ -5252,22 +5390,6 @@
<translation>Kon bestandsrecord %1 niet instellen op de lokale DB: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Bestandsconflict</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Slechts %1 beschikbaar, maar heeft minimaal %2 nodig om te starten</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>Kon de lokale sync-database niet openen of aanmaken. Zorg ervoor dat je schrijf-toegang hebt in de sync-map</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>gebruik maken van virtuele bestanden met achtervoegsel, maar achtervoegsel niet ingesteld</translation>
@@ -5287,16 +5409,6 @@
<source>Cannot open the sync journal</source>
<translation>Kan het sync transactielog niet openen</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Schijfruimte laag: Downloads die de vrije ruimte tot onder %1 zouden reduceren, zijn overgeslagen.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>Onvoldoende schijfruimte op de server voor sommige uploads.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5307,7 +5419,7 @@
<translation>Offline</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5691,11 +5803,6 @@
<source>Less than a minute</source>
<translation>Minder dan een minuut</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5703,20 +5810,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5731,6 +5828,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5873,6 +5985,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Log alstublieft in</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>Er zijn geen synchronisatie-mappen geconfigureerd.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Losgekoppeld van %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Niet-ondersteunde server versie</translation>
@@ -5893,31 +6020,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Losgekoppeld van %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Losgekoppeld van account:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Account %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Log alstublieft in</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Account synchronisatie is uitgeschakeld</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5939,11 +6041,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>Er zijn geen synchronisatie-mappen geconfigureerd.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Controleren op wijzigingen in externe "%1"</translation>
@@ -5954,6 +6051,21 @@
<translation>Controleren op wijzigingen in lokale "%1"</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Losgekoppeld van account:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Account %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Account synchronisatie is uitgeschakeld</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5962,11 +6074,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Lokale map</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Gebruikersnaam</translation>
@@ -6002,22 +6109,11 @@
<translation>Vraag bevestiging voor synchronisatie van mappen groter dan</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Vraag bevestiging voor synchronisatie externe opslag</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Selectieve synchronisatie</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Bewaar de lokale gegevens</translation>
@@ -6032,6 +6128,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Wis de map op je computer en start een schone sync</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Selectieve synchronisatie</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Lokale map</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6072,6 +6184,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>in de toekomst</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>nu</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Even geleden</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6112,57 +6269,12 @@
<source>Synced %1</source>
<translation>Gesynchroniseerd %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>in de toekomst</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>nu</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Even geleden</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6251,7 +6363,7 @@
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="402"/>
<source>Allow resharing</source>
- <translation>Verder delen toestaan</translation>
+ <translation>Opnieuw delen toestaan</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="441"/>
@@ -6408,6 +6520,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>Open lokale of groepsmappen</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Open lokale map</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Verbonden</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>Niet verbonden</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>Open lokale map "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>Open groepsmap "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>Open %1 in bestandsverkenner</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>Menu gebruikersgroep en lokale mappen</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6597,16 +6752,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6621,6 +6766,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6854,16 +7009,16 @@
<translation>Er trad een fout op bij het instellen</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Voorbereiden synchronisatie</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>Synchronisatie stoppen</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Voorbereiden synchronisatie</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Synchronisatie is gepauzeerd</translation>
@@ -6922,4 +7077,17 @@
<translation>Lokale ruimte vrijmaken</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>Snelle sync inschakelen</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>Snelle synchronisatie synchroniseert alleen wijzigingen in bestanden en mappen binnen mappen die zijn verkend. Dit kan de reactiesnelheid bij de eerste configuratie van virtuele bestanden aanzienlijk verbeteren. Het zal echter leiden tot overbodige downloads van bestanden die verplaatst zijn naar een niet verkende map.</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_oc.ts nextcloud-desktop-3.16.6/translations/client_oc.ts
--- nextcloud-desktop-3.16.4/translations/client_oc.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_oc.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
@@ -570,7 +562,7 @@
<translation>Passar</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Espaci d?emmagazinatge?: ?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Anullar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Aplicar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Connectat a <server> coma <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>O sincronizar tot</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Aplicar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Espaci d?emmagazinatge?: ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Anullar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Connectat a <server> coma <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Cap de compte pas configurat.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation type="unfinished"/>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Cap de compte pas configurat.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation type="unfinished"/>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -730,12 +738,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Dobrir lo dossi?r</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Chifrar</translation>
@@ -774,16 +776,6 @@
<translation>Tornar sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Reprendre la sincro.</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Suspendre la sincro.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Suprimir la sincro. del dossi?r</translation>
@@ -809,21 +801,11 @@
<translation>Creacion del dossi?r pas re?ssida</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Creacion impossibla del dossi?r local <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation type="unfinished"/>
@@ -853,23 +835,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -883,36 +865,46 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) sus %2 utilizat. D?unes dossi?rs, coma los dossi?rs montats sul ret o partejats, p?don possedir diferents limits.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 es utilizat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 sus %2 en utilizacion</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Per ara i a pas cap d?informacion sus l?utilizacion de l?espaci d?emmaganizatge.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 es utilizat</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 coma %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Aqueste compte es compatible amb lo chiframent del cap a la fin</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
<source>Connected to %1.</source>
<translation>Connectat a %1.</translation>
@@ -928,80 +920,126 @@
<translation>Lo servidor %1 es actualament en m?de mantenen?a.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Desconnexion de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Connexion a %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Error de configuracion servidor : %1 a %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Dobrir lo dossi?r</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Reprendre la sincro.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Suspendre la sincro.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Creacion impossibla del dossi?r local <i>%1</i>.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Cap de connexion %1 configurat.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) sus %2 utilizat. D?unes dossi?rs, coma los dossi?rs montats sul ret o partejats, p?don possedir diferents limits.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 sus %2 en utilizacion</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Per ara i a pas cap d?informacion sus l?utilizacion de l?espaci d?emmaganizatge.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 coma %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Connexion a %1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Aqueste compte es compatible amb lo chiframent del cap a la fin</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Error de configuracion servidor : %1 a %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Cap de connexion %1 configurat.</translation>
+ </message>
</context>
<context>
<name>OCC::AccountSetupFromCommandLineJob</name>
@@ -1115,11 +1153,6 @@
<translation>Certificat e clau (pkcs12) :</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Perc?rrer?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Senhal del certificat?:</translation>
@@ -1130,6 +1163,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Perc?rrer?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Seleccionar un certificat</translation>
@@ -1180,46 +1218,46 @@
<translation>Contunhar</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Error d?acc?s al fichi?r de configuracion</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation type="unfinished"/>
</message>
@@ -1261,6 +1299,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1268,6 +1345,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
@@ -1472,7 +1554,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Error en escrivent las metadonadas dins la basa de donadas</translation>
</message>
@@ -1602,21 +1684,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Confirmar la supression</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1630,30 +1697,30 @@
%1</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Cap de compte Nextcloud pas configurat</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Error d?autentificacion?: si? lo nom d?utilizaire si? lo senhal es pas corr?cte.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Confirmar la supression</translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
+ <message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Los identificants fornits son pas corr?ctes</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>Lo servidor configurat per aqueste client es tr?p vi?lh</translation>
@@ -1663,16 +1730,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Merc?s de metre a niv?l al darri?r servidor e reaviatz lo client.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Error d?autentificacion?: si? lo nom d?utilizaire si? lo senhal es pas corr?cte.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Cap de compte Nextcloud pas configurat</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Los identificants fornits son pas corr?ctes</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation type="unfinished"/>
</message>
@@ -1680,19 +1762,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1700,27 +1782,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Error en dobrissent lo repert?ri %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Repert?ri pas trobat : %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Error en legissent lo repert?ri %1</translation>
</message>
@@ -1959,11 +2041,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
@@ -1975,15 +2052,14 @@
<translation>Error enviada pel servidor?: <em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
- <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
+ <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
<message>
@@ -1993,10 +2069,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2039,6 +2121,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 es estat suprimit.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 es estat actualizat.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 es estat renomenat en %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 es estat despla?at a %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2054,17 +2164,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 e %n autre fichi?r son estats suprimits.</numerusform><numerusform>%1 e %n autres fichi?rs son estats suprimits.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 es estat suprimit.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 e %n autre fichi?r son estats aponduts.</numerusform><numerusform>%1 e %n autres fichi?rs son estats aponduts.</numerusform></translation>
@@ -2080,33 +2179,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 es estat actualizat.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 es estat renomenat en %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 es estat despla?at a %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2143,65 +2225,65 @@
<translation>Activitat de la sincro.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2210,41 +2292,41 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2285,11 +2367,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(salvagarda)</translation>
@@ -2300,6 +2377,11 @@
<translation> (salvagarda %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation type="unfinished"/>
@@ -2370,16 +2452,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>La sincronizacion es suspenduda.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (Sincro. en pausa)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2426,6 +2498,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>La sincronizacion es suspenduda.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (Sincro. en pausa)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2469,16 +2551,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>I a de conflictes pas resolguts. Clicatz pels detalhs.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation type="unfinished"/>
@@ -2520,15 +2592,30 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>I a de conflictes pas resolguts. Clicatz pels detalhs.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2576,21 +2663,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 sus %2, fichi?r %3 sus %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2750,11 +2832,6 @@
<translation>Param?tres generals</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Lan?ar a l?aviada del sist?ma</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>Mostrar las notificacions de sonadas</translation>
@@ -2765,11 +2842,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Utilizar las ic?nas &monocr?mas</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2785,17 +2857,32 @@
<translation>Avan?at</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Demandar una confirmacion abans de sincronizar los dossi?rs nov?ls mai gr?sses que</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>Mo</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Demandar una confirmacion abans de sincronizar los dossi?rs ext?rns</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Lan?ar a l?aviada del sist?ma</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Utilizar las ic?nas &monocr?mas</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Demandar una confirmacion abans de sincronizar los dossi?rs nov?ls mai gr?sses que</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>Afichar una notificacion quand de dossi?rs venon mai gr?sses que lo limit especificat</translation>
@@ -2806,11 +2893,6 @@
<translation>Desactivar automaticament la sincronizacion dels dossi?rs que subrepassan lo limit</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Demandar una confirmacion abans de sincronizar los dossi?rs ext?rns</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>Despla?ar a l?escobilhi?r los fichi?rs suprimits</translation>
@@ -2862,11 +2944,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Reaviar e metre a jorn</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>Verificar &automaticament las mesas a jorn</translation>
@@ -2887,6 +2964,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Reaviar e metre a jorn</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Las notificacions del servidor que demanda v?stra atencion.</translation>
@@ -2907,6 +2994,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>estable</translation>
@@ -2981,6 +3073,11 @@
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3141,102 +3238,97 @@
<translation>Nom nov?l de fichi?r</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Renomenar fichi?r</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>Lo nom del fichi?r conten un espaci inicial e final.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>Lo nom del fichi?r conten d?espacis inicials.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation type="unfinished"/>
</message>
@@ -3357,16 +3449,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Sautar aqueste c?p</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation type="unfinished"/>
@@ -3391,6 +3473,16 @@
<source>Update manually</source>
<translation>Actualizar manualament</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Sautar aqueste c?p</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3415,6 +3507,23 @@
<translation>Lo servidor mandatari requer?s una autentificacion</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Debit per recebre</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Limitar a</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>Ko/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation type="unfinished"/>
@@ -3437,46 +3546,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Debit per recebre</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Cap de limit</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>Ko/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Limitar a</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Debit per mandar</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Limitar automaticament</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Debit per mandar</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Nom d?oste del servidor mandatari</translation>
@@ -3505,6 +3597,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>Verificacion de las mesas a jorn impossibla.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Verificacion del servidor de mesa a jorn?</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation type="unfinished"/>
@@ -3535,11 +3637,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>Verificacion de las mesas a jorn impossibla.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation type="unfinished"/>
@@ -3550,13 +3647,18 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Verificacion del servidor de mesa a jorn?</translation>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
- <source>Update status is unknown: Did not check for new updates.</source>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3735,11 +3837,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>URL invalida</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation type="unfinished"/>
@@ -3750,6 +3847,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>URL invalida</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation type="unfinished"/>
@@ -3760,11 +3867,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation type="unfinished"/>
@@ -3970,68 +4072,58 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
+ <source>File names containing the character "%1" are not supported on this file system.</source>
+ <comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
- <source>File names containing the character "%1" are not supported on this file system.</source>
- <comment>%1: the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
+ <source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
+ <source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>Folder name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
+ <source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
+ <source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
- <source>File name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="433"/>
+ <source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
- <source>Folder name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
- <source>File name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="433"/>
- <source>Filename contains trailing spaces.</source>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
@@ -4043,6 +4135,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>Lo nom del fichi?r conten d?espacis inicials.</translation>
@@ -4133,64 +4235,74 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation type="unfinished"/>
</message>
@@ -4198,38 +4310,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4247,12 +4359,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4309,6 +4415,12 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4326,39 +4438,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4371,14 +4483,14 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4386,49 +4498,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4485,39 +4597,39 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
@@ -4525,22 +4637,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4548,11 +4649,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
@@ -4582,6 +4678,22 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4830,6 +4942,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Men? cont?xtual del partatge</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Ai partejat quic?m amb tu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Opcions de partatge</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Enviar un ligam privat per mail ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Copiar lo ligam privat al quichapapi?r</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4862,43 +5000,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Men? cont?xtual del partatge</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Ai partejat quic?m amb tu</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Opcions de partatge</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Activitat</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Copiar lo ligam privat al quichapapi?r</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Enviar un ligam privat per mail ?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4914,11 +5026,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Copiar lo ligam int?rn</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -4945,12 +5052,6 @@
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Dobrir dins lo navegador</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation type="unfinished"/>
@@ -4980,6 +5081,17 @@
<source>Delete</source>
<translation>Suprimir</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Copiar lo ligam int?rn</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Dobrir dins lo navegador</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5081,13 +5193,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Aquesta connexion es PAS segura estant qu?es pas chifrada.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Version del servidor?: %1</translation>
@@ -5107,6 +5212,13 @@
<source>The connection is not secure</source>
<translation>La connexion es pas segura</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Aquesta connexion es PAS segura estant qu?es pas chifrada.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5199,23 +5311,24 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="383"/>
- <source>Could not update file: %1</source>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="412"/>
- <source>Could not update virtual file metadata: %1</source>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="419"/>
- <source>Could not update file metadata: %1</source>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="433"/>
- <source>Could not set file record to local DB: %1</source>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -5224,14 +5337,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <location filename="../src/libsync/syncengine.cpp" line="383"/>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="412"/>
+ <source>Could not update virtual file metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="419"/>
+ <source>Could not update file metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="433"/>
+ <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/>
</message>
<message>
@@ -5254,16 +5376,6 @@
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5274,7 +5386,7 @@
<translation>F?ra linha</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5658,11 +5770,6 @@
<source>Less than a minute</source>
<translation>Mens d?una setmana</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5670,20 +5777,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5698,6 +5795,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5840,6 +5952,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Merc?s de vos connectar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Desconnectat de %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation type="unfinished"/>
@@ -5860,31 +5987,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Desconnectat de %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Desconnectat dels comptes?:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Compte %1?: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Merc?s de vos connectar</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Sincronizacion del compte desactivada</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5906,11 +6008,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Verificacion de las modificacions distantas dins ??%1??</translation>
@@ -5921,6 +6018,21 @@
<translation>Verificacion de las modificacions localas dins ??%1??</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Desconnectat dels comptes?:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Compte %1?: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Sincronizacion del compte desactivada</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5929,11 +6041,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Dossi?r local</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation type="unfinished"/>
@@ -5969,22 +6076,11 @@
<translation>Demandar abans de sincronizar los dossi?rs nov?ls mai gr?sses que</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>Mo</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Demandar abans de sincronizar los sup?rts ext?rns</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Causisr qu? sincronizar</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Gardar las donadas localas</translation>
@@ -5999,6 +6095,22 @@
<source>Erase local folder and start a clean sync</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>Mo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Causisr qu? sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Dossi?r local</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6039,6 +6151,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>dins lo futur</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>ara</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Fa qualque temps</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1?: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6079,57 +6236,12 @@
<source>Synced %1</source>
<translation>%1 sincronizat</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>dins lo futur</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>ara</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Fa qualque temps</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1?: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6375,6 +6487,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6564,16 +6719,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 O</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 Go</translation>
@@ -6588,6 +6733,16 @@
<source>%L1 KB</source>
<translation>%L1 Ko</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 O</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6821,16 +6976,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Preparacion de la sincro.</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Preparacion de la sincro.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Sincro. en pausa</translation>
@@ -6889,4 +7044,17 @@
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_pl.ts nextcloud-desktop-3.16.6/translations/client_pl.ts
--- nextcloud-desktop-3.16.4/translations/client_pl.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_pl.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>W??cz szybk? synchronizacj?</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>Szybka synchronizacja b?dzie synchronizowa? tylko zmiany w plikach i katalogach w katalogach, kt?re zosta?y zbadane. Mo?e to znacznie zwi?kszy? responsywno?? pocz?tkowej konfiguracji plik?w wirtualnych. Jednak spowoduje to zb?dne pobieranie plik?w przeniesionych do niezbadanego katalogu.</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>W??cz pliki wirtualne</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation>Zezw?l na usuwanie element?w z Kosza</translation>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -558,7 +550,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Starszy import</translation>
</message>
@@ -573,7 +565,7 @@
<translation>Pomi?</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>Nie mo?na zaimportowa? kont ze starszej konfiguracji klienta.</translation>
</message>
@@ -581,33 +573,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Przestrze? magazynowa?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Niezaznaczone katalogi zostan? <b>usuni?te</b> z lokalnego systemu plik?w i nie b?d? ju? wi?cej synchronizowane na tym komputerze.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Anuluj</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Zastosuj</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Po??czony z <server> jako <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Synchronizuj wszystko</translation>
@@ -638,6 +608,33 @@
<translation>Ustawienia po??czenia</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Zastosuj</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Przestrze? magazynowa?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Anuluj</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Po??czony z <server> jako <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Brak skonfigurowanych kont.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>Szyfrowanie end-to-end za pomoc? wirtualnych plik?w</translation>
@@ -672,9 +669,9 @@
<b>Proces ten nie jest odwracalny. Na pewno chcesz kontynuowa??</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Brak skonfigurowanych kont.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation>Zapomnij o konfiguracji szyfrowania</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -687,6 +684,11 @@
<translation>Wy?wietl mnemonik</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation>Szyfrowanie jest skonfigurowane. Pami?taj, aby <b>zaszyfrowa?</b> katalog, kt?ry pozwoli na szyfrowanie metod? end-to-end wszystkich nowych plik?w dodawanych do niego.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>Na tym koncie w??czono szyfrowanie typu end-to-end</translation>
@@ -712,6 +714,13 @@
<translation>Katalog zawiera b??d synchronizacji. Szyfrowanie tego katalogu b?dzie mo?liwe po pomy?lnej synchronizacji</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation>Nie mo?esz zaszyfrowa? tego katalogu, poniewa? szyfrowanie typu end-to-end nie jest jeszcze skonfigurowane na tym urz?dzeniu.
+Czy chcesz to zrobi? teraz?</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -736,12 +745,6 @@
<translation>Nie mo?na zaszyfrowa? katalogu, poniewa? katalog ju? nie istnieje</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Otw?rz katalog</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Szyfruj</translation>
@@ -780,16 +783,6 @@
<translation>Uruchom ponownie synchronizacj?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Wzn?w synchronizacj?</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Wstrzymaj synchronizacj?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Usu? katalog synchronizacji</translation>
@@ -815,21 +808,11 @@
<translation>Utworzenie katalogu nie powiod?o si?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Nie mo?na utworzy? katalogu lokalnego <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Potwierd? usuni?cie katalogu synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Czy na pewno chcesz zatrzyma? synchronizacj? katalogu <i>%1</i>?</p><p><b>Uwaga:</b> Ta operacja <b>nie</b> usunie ?adnych plik?w.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Usu? katalog synchronizacji</translation>
@@ -863,24 +846,24 @@
<translation>Mnemonik szyfrowania end-to-end</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>Aby chroni? Twoj? to?samo?? kryptograficzn?, szyfrujemy j? za pomoc? mnemonika z 12 s??w s?ownikowych. Has?o zachowaj w bezpiecznym miejscu. B?dzie ono potrzebne do dodania innych urz?dze? do Twojego konta (takich jak telefon kom?rkowy lub laptop).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation>Aby chroni? Twoj? to?samo?? kryptograficzn?, szyfrujemy j? za pomoc? mnemonika 12 s??w s?ownikowych. Zanotuj go i przechowuj w bezpiecznym miejscu. B?dzie Ci potrzebny do skonfigurowania synchronizacji zaszyfrowanych katalog?w na innych urz?dzeniach.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>Wy??cz szyfrowanie end-to-end</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation>Zapomnij o szyfrowaniu end-to-end na tym urz?dzeniu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>Wy??czy? szyfrowanie end-to-end dla %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation>Czy chcesz zapomnie? o ustawieniach szyfrowania typu end-to-end dla %1 na tym urz?dzeniu?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>Usuni?cie szyfrowania end-to-end spowoduje usuni?cie plik?w zsynchronizowanych lokalnie, kt?re s? zaszyfrowane.<br>Zaszyfrowane pliki pozostan? na serwerze.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation>Zapomnienie o szyfrowaniu typu end-to-end spowoduje usuni?cie poufnych danych i wszystkich zaszyfrowanych plik?w z tego urz?dzenia.<br>Zaszyfrowane pliki pozostan? jednak na serwerze i wszystkich pozosta?ych urz?dzeniach, je?eli zosta?y odpowiednio skonfigurowane.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -893,34 +876,44 @@
<translation>Operacja synchronizacji jest uruchomiona.<br/>Czy chcesz j? zako?czy??</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) z %2 w u?yciu. Niekt?re katalogi, w tym zamontowane lub udost?pnione katalogi w sieci, mog? mie? r??ne ograniczenia.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>Wykorzystane: %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>Wykorzystane: %1 z %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>Migracja certyfikatu do nowego</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Obecnie nie ma dost?pnych informacji o wykorzystaniu pami?ci.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>Istniej? katalogi, kt?rych rozmiar przekracza %1MB: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>Wykorzystane: %1</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation>Szyfrowanie typu end-to-end zosta?o zainicjowane na tym koncie z innym urz?dzeniem.<br>Wprowad? unikalny mnemonik, aby zsynchronizowa? zaszyfrowane katalogi r?wnie? na tym urz?dzeniu.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 jako %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>Szyfrowanie end-to-end zosta?o w??czone na tym koncie z innym urz?dzeniu.<br>Mo?na je w??czy? na tym urz?dzeniu, wprowadzaj?c sw?j mnemonik.<br>Umo?liwi to synchronizacj? istniej?cych zaszyfrowanych katalog?w.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>Wersja serwera %1 nie jest ju? obs?ugiwana! Kontynuujesz na w?asne ryzyko.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation>To konto obs?uguje szyfrowanie typu end-to-end, ale najpierw nale?y je skonfigurowa?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>W??cz szyfrowanie</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>To konto obs?uguje szyfrowanie end-to-end</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -938,79 +931,125 @@
<translation>Serwer %1 jest obecnie w trybie konserwacji.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>Serwer %1 jest obecnie przekierowywany lub po??czenie znajduje si? za portalem przechwytuj?cym.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Wylogowano z %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>??czenie do %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Katalogi te nie zosta?y zsynchronizowane poniewa? s? zbyt du?e:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>Nie mo?na po??czy? si? z %@</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Katalogi te nie zosta?y zsynchronizowane, poniewa? znajduj? si? w magazynach zewn?trznych: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>B??d konfiguracji serwera: %1 w %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Katalogi te nie zosta?y zsynchronizowane, poniewa? s? zbyt du?e lub znajduj? si? w magazynach zewn?trznych: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>Musisz zaakceptowa? warunki korzystania z us?ugi na %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Otw?rz katalog</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Nie skonfigurowano po??czenia %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Wzn?w synchronizacj?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>Migracja certyfikatu do nowego</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Wstrzymaj synchronizacj?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Katalogi te nie zosta?y zsynchronizowane poniewa? s? zbyt du?e:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Nie mo?na utworzy? katalogu lokalnego <i>%1</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Katalogi te nie zosta?y zsynchronizowane, poniewa? znajduj? si? w magazynach zewn?trznych: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Czy na pewno chcesz zatrzyma? synchronizacj? katalogu <i>%1</i>?</p><p><b>Uwaga:</b> Ta operacja <b>nie</b> usunie ?adnych plik?w.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Katalogi te nie zosta?y zsynchronizowane, poniewa? s? zbyt du?e lub znajduj? si? w magazynach zewn?trznych: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>Aby chroni? Twoj? to?samo?? kryptograficzn?, szyfrujemy j? za pomoc? mnemonika z 12 s??w s?ownikowych. Has?o zachowaj w bezpiecznym miejscu. B?dzie ono potrzebne do dodania innych urz?dze? do Twojego konta (takich jak telefon kom?rkowy lub laptop).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>Istniej? katalogi, kt?rych rozmiar przekracza %1MB: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>Wy??cz szyfrowanie end-to-end</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>Szyfrowanie end-to-end zosta?o w??czone na tym koncie z innym urz?dzeniu.<br>Mo?na je w??czy? na tym urz?dzeniu, wprowadzaj?c sw?j mnemonik.<br>Umo?liwi to synchronizacj? istniej?cych zaszyfrowanych katalog?w.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>Wy??czy? szyfrowanie end-to-end dla %1?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>To konto obs?uguje szyfrowanie end-to-end</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>Usuni?cie szyfrowania end-to-end spowoduje usuni?cie plik?w zsynchronizowanych lokalnie, kt?re s? zaszyfrowane.<br>Zaszyfrowane pliki pozostan? na serwerze.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>W??cz szyfrowanie</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) z %2 w u?yciu. Niekt?re katalogi, w tym zamontowane lub udost?pnione katalogi w sieci, mog? mie? r??ne ograniczenia.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>Wykorzystane: %1 z %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Obecnie nie ma dost?pnych informacji o wykorzystaniu pami?ci.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 jako %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>Wersja serwera %1 nie jest ju? obs?ugiwana! Kontynuujesz na w?asne ryzyko.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>Serwer %1 jest obecnie przekierowywany lub po??czenie znajduje si? za portalem przechwytuj?cym.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>??czenie do %1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>Nie mo?na po??czy? si? z %@</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>B??d konfiguracji serwera: %1 w %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>Musisz zaakceptowa? warunki korzystania z us?ugi na %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Nie skonfigurowano po??czenia %1.</translation>
</message>
</context>
<context>
@@ -1125,11 +1164,6 @@
<translation>Certyfikat i Klucz (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Przegl?daj?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Has?o certyfikatu:</translation>
@@ -1140,6 +1174,11 @@
<translation>Zdecydowanie zaleca si? szyfrowanie pkcs12, poniewa? kopia zostanie zapisana w pliku konfiguracyjnym.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Przegl?daj?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Wybierz certyfikat</translation>
@@ -1190,34 +1229,34 @@
<translation>Kontynuuj</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 kont</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 konto</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 katalog?w</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 katalog</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Import ze starszej wersji</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1225,12 +1264,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>B??d dost?pu do pliku konfiguracyjnego</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>Wyst?pi? b??d podczas dost?pu do pliku konfiguracyjnego w %1. Upewnij si?, ?e dost?p do pliku jest mo?liwy z Twojego konta systemowego.</translation>
</message>
@@ -1272,6 +1311,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation>Plik zosta? zmieniony od czasu wykrycia</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation>Nie mo?na usun?? rekordu pliku %1 z lokalnej bazy danych</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation>Plik %1 nie mo?e zosta? pobrany, poniewa? nie jest wirtualny!</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation>Nie mo?na pobra? pliku %1 z lokalnej bazy danych</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation>Plik %1 nie mo?e zosta? pobrany, poniewa? brakuje informacji o szyfrowaniu</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation>B??d podczas aktualizacji metadanych: %1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation>Plik %1 jest obecnie u?ywany</translation>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1279,6 +1357,11 @@
<translation>Plik %1 nie mo?e zosta? wys?any, poniewa? istnieje inny plik o tej samej nazwie, r??ni?cy si? tylko wielko?ci? liter</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation>Plik zawiera pocz?tkowe lub ko?cowe spacje i nie m?g? zosta? przemianowany</translation>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Plik %1 ma nieprawid?owy czas modyfikacji. Nie wysy?aj na serwer.</translation>
@@ -1483,7 +1566,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>B??d zapisu metadanych do bazy danych</translation>
</message>
@@ -1613,21 +1696,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Czy chcesz trwale usun?? katalog <i>%1</i> i ca?? jego zawarto???</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Czy chcesz trwale usun?? plik <i>%1</i>?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Potwierd? usuni?cie</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1643,30 +1711,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Nie skonfigurowano konta Nextcloud</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Czy chcesz trwale usun?? katalog <i>%1</i> i ca?? jego zawarto???</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>B??d uwierzytelnienia: nazwa u?ytkownika lub has?o s? nieprawid?owe.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Czy chcesz trwale usun?? plik <i>%1</i>?</translation>
</message>
<message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Potwierd? usuni?cie</translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
+ <message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Przekroczono limit czasu</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Podane po?wiadczenia s? nieprawid?owe</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>Konfigurowany serwer dla tego klienta jest za stary</translation>
@@ -1676,16 +1744,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Zaktualizuj serwer do najnowszej wersji i zrestartuj klienta.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>B??d uwierzytelnienia: nazwa u?ytkownika lub has?o s? nieprawid?owe.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Nie skonfigurowano konta Nextcloud</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Podane po?wiadczenia s? nieprawid?owe</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>B??d podczas anulowania usuwania pliku</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>B??d podczas anulowania usuwania %1</translation>
</message>
@@ -1693,19 +1776,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>B??d serwera: odpowied? PROPFIND nie ma formatu XML!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>B??d konfiguracji zaszyfrowanych metadanych!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>B??d konfiguracji zaszyfrowanych metadanych: pocz?tkowa sygnatura z serwera jest pusta.</translation>
</message>
@@ -1713,27 +1796,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>B??d podczas otwierania katalogu %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Katalog niedost?pny w kliencie, odmowa uprawnienia</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Nie znaleziono katalogu: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>Kodowanie nazwy pliku jest nieprawid?owe</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>B??d podczas odczytu katalogu %1</translation>
</message>
@@ -1955,29 +2038,24 @@
<location filename="../src/gui/filedetails/filedetails.cpp" line="137"/>
<source>%1 month(s) ago</source>
<comment>months elapsed since file last modified</comment>
- <translation><numerusform>%1 miesi?c(y) temu</numerusform><numerusform>%1 miesi?c(y) temu</numerusform><numerusform>%1 miesi?c(y) temu</numerusform><numerusform>%1 miesi?c(y) temu</numerusform></translation>
+ <translation><numerusform>%1 miesi?c temu</numerusform><numerusform>%1 miesi?ce temu</numerusform><numerusform>%1 miesi?cy temu</numerusform><numerusform>%1 miesi?cy temu</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/filedetails/filedetails.cpp" line="140"/>
<source>%1 year(s) ago</source>
<comment>years elapsed since file last modified</comment>
- <translation><numerusform>%1 lat(a) temu</numerusform><numerusform>%1 lat(a) temu</numerusform><numerusform>%1 lat(a) temu</numerusform><numerusform>%1 lat(a) temu</numerusform></translation>
+ <translation><numerusform>%1 rok temu</numerusform><numerusform>%1 lata temu</numerusform><numerusform>%1 lat temu</numerusform><numerusform>%1 lat temu</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/filedetails/filedetails.cpp" line="172"/>
<source>Locked by %1 - Expires in %2 minute(s)</source>
<comment>remaining time before lock expires</comment>
- <translation><numerusform>Zablokowane przez %1 ? wygasa za %2 minut(y)</numerusform><numerusform>Zablokowane przez %1 ? wygasa za %2 minut(y)</numerusform><numerusform>Zablokowane przez %1 ? wygasa za %2 minut(y)</numerusform><numerusform>Zablokowane przez %1 ? wygasa za %2 minut(y)</numerusform></translation>
+ <translation><numerusform>Zablokowane przez %1 ? wygasa za %2 minut?</numerusform><numerusform>Zablokowane przez %1 ? wygasa za %2 minuty</numerusform><numerusform>Zablokowane przez %1 ? wygasa za %2 minut</numerusform><numerusform>Zablokowane przez %1 ? wygasa za %2 minut</numerusform></translation>
</message>
</context>
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>Adres URL odpytywania nie zaczyna si? od HTTPS pomimo adresu URL logowania zaczynaj?cego si? od HTTPS. Logowanie nie b?dzie mo?liwe, poniewa? mo?e to stanowi? problem z bezpiecze?stwem. Skontaktuj si? z administratorem.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>Zwr?cony adres URL serwera nie zaczyna si? od HTTPS pomimo adresu URL logowania zaczynaj?cego si? od HTTPS. Logowanie nie b?dzie mo?liwe, poniewa? mo?e to stanowi? problem z bezpiecze?stwem. Skontaktuj si? z administratorem.</translation>
@@ -1989,28 +2067,33 @@
<translation>Serwer zwr?ci? b??d: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>Adres URL odpytywania nie zaczyna si? od HTTPS pomimo adresu URL logowania zaczynaj?cego si? od HTTPS. Logowanie nie b?dzie mo?liwe, poniewa? mo?e to stanowi? problem z bezpiecze?stwem. Skontaktuj si? z administratorem.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Wyst?pi? b??d podczas uzyskiwania dost?pu do punktu ko?cowego "tokena": <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Nie mo?na przeanalizowa? kodu JSON zwr?conego z serwera: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>Odpowied? z serwera nie zawiera?a wszystkich oczekiwanych zakres?w</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation>Odpowied? serwera nie zawiera?a wszystkich oczekiwanych p?l: <br><em>%1</em></translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Nie mo?na przeanalizowa? kodu JSON zwr?conego z serwera: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2053,6 +2136,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 zosta? usuni?ty.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 zosta? zaktualizowany.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>Nazwa %1 zosta?a zmieniona na %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 zosta? przeniesiony do %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation><numerusform>%1 i %n inny plik zosta? usuni?ty.</numerusform><numerusform>%1 i %n inne pliki zosta?y usuni?te.</numerusform><numerusform>%1 i %n innych plik?w zosta?o usuni?tych.</numerusform><numerusform>%1 i %n innych plik?w zosta?o usuni?tych.</numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>Prosz? wybra? inn? lokalizacj?. Katalog %1 nie istnieje.</translation>
@@ -2068,17 +2179,6 @@
<translation>Prosz? wybra? inn? lokalizacj?. %1 nie jest katalogiem mo?liwym do odczytu.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 i %n inny plik zosta? usuni?ty.</numerusform><numerusform>%1 i %n inne pliki zosta?y usuni?te.</numerusform><numerusform>%1 i %n innych plik?w zosta?o usuni?tych.</numerusform><numerusform>%1 i %n innych plik?w zosta?o usuni?tych.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 zosta? usuni?ty.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 i %n inny plik zosta? dodany.</numerusform><numerusform>%1 i %n inne pliki zosta?y dodane.</numerusform><numerusform>%1 i %n innych plik?w zosta?o dodanych.</numerusform><numerusform>%1 i %n innych plik(?w) zosta?o dodanych.</numerusform></translation>
@@ -2094,33 +2194,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 i %n inny plik zosta? zaktualizowany.</numerusform><numerusform>%1 i %n inne pliki zosta?y zaktualizowane.</numerusform><numerusform>%1 i %n innych plik?w zosta?o zaktualizowanych.</numerusform><numerusform>%1 i %n innych plik?w zosta?o zaktualizowanych.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 zosta? zaktualizowany.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>Nazwa %1 zosta?a zmieniona na %2 i w %n innym pliku.</numerusform><numerusform>Nazwa %1 zosta?a zmieniona na %2 i w %n innych plikach.</numerusform><numerusform>Nazwa %1 zosta?a zmieniona na %2 i w %n innych plikach.</numerusform><numerusform>Nazwa %1 zosta?a zmieniona na %2 i w %n innych plikach.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>Nazwa %1 zosta?a zmieniona na %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 zosta? przeniesiony do %2 i %n inny plik.</numerusform><numerusform>%1 zosta? przeniesiony do %2 i %n inne pliki.</numerusform><numerusform>%1 zosta? przeniesiony do %2 i %n innych plik?w.</numerusform><numerusform>%1 zosta? przeniesiony do %2 i %n innych plik?w.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 zosta? przeniesiony do %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2157,68 +2240,68 @@
<translation>Synchronizuj aktywno??</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Nie mo?na odczyta? systemowego pliku wyklucze?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Dodano nowy katalog wi?kszy ni? %1 MB: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Dodano katalog z magazynu zewn?trznego.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Przejd? do ustawie?, aby go wybra? do pobrania.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>Katalog przekroczy? ustawiony limit rozmiaru katalogu wynosz?cy %1MB: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>Kontynuuj synchronizacj?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>Zatrzymaj synchronizacj?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>Katalog %1 przekroczy? ustawiony limit rozmiaru katalogu wynosz?cy %2MB.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>Czy chcesz zatrzyma? synchronizacj? tego katalogu?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Katalog %1 zosta? utworzony, ale wcze?niej zosta? wykluczony z synchronizacji. Dane w nim zawarte nie zostan? zsynchronizowane.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Plik %1 zosta? utworzony, ale wcze?niej zosta? wykluczony z synchronizacji. Nie zostanie on zsynchronizowany.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2231,12 +2314,12 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>Pobieranie pliku wirtualnego nie powiod?o si? z powodu kodu "%1", status "%2" i komunikatu o b??dzie "%3"</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2245,7 +2328,7 @@
Alternatywnie mo?esz przywr?ci? wszystkie usuni?te pliki, przesy?aj?c je z katalogu '%1' na serwer.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2254,22 +2337,22 @@
Alternatywnie mo?esz przywr?ci? wszystkie usuni?te pliki, pobieraj?c je z serwera.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>Usun?? wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>Kontynuuj usuwanie</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>Przywr?? pliki na serwer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>Przywr?? pliki z serwera</translation>
</message>
@@ -2310,11 +2393,6 @@
<translation>Nie mo?na zresetowa? stanu katalogu</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>Znaleziono stary dziennik synchronizacji "%1", ale nie mo?na go usun??. Upewnij si?, ?e ?adna aplikacja go nie u?ywa.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation> (kopia zapasowa)</translation>
@@ -2325,6 +2403,11 @@
<translation> (kopia zapasowa %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>Znaleziono stary dziennik synchronizacji "%1", ale nie mo?na go usun??. Upewnij si?, ?e ?adna aplikacja go nie u?ywa.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Stan niezdefiniowany.</translation>
@@ -2395,16 +2478,6 @@
<translation>??danie o synchronizacj? zosta?o anulowane.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Synchronizacja wstrzymana.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (Synchronizacja wstrzymana)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>Prosz? wybra? inn? lokalizacj?. Wybrany katalog jest nieprawid?owy.</translation>
@@ -2454,6 +2527,16 @@
Aby rozwi?za? ten problem: usu? %1 z jednego z kont i utw?rz nowy katalog synchronizacji.
Dla zaawansowanych u?ytkownik?w: ten problem mo?e by? zwi?zany z wieloma plikami bazy danych synchronizacji znalezionymi w jednym katalogu. Sprawd? %1 pod k?tem nieaktualnych i nieu?ywanych plik?w .sync_*.db i usu? je.</translation>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Synchronizacja wstrzymana.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (Synchronizacja wstrzymana)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2497,16 +2580,6 @@
<translation>Wyst?pi? b??d podczas pobierania listy katalog?w z serwera.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Pobieranie listy katalog?w z serwera?</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Wyst?pi?y nierozwi?zane konflikty. Kliknij, aby pozna? szczeg??y.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>Obs?uga plik?w wirtualnych jest w??czona.</translation>
@@ -2548,16 +2621,31 @@
<translation>%1 %2?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>Pobieranie %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>Plik %1 z %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Wyst?pi?y nierozwi?zane konflikty. Kliknij, aby pozna? szczeg??y.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>Pobieranie %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Pobieranie listy katalog?w z serwera?</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2604,21 +2692,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>Plik %3 z %4, %1 z %2</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>Plik %1 z %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>Oczekiwanie na %n inny katalog?</numerusform><numerusform>Oczekiwanie na %n inne katalogi?</numerusform><numerusform>Oczekiwanie na %n innych katalog?w?</numerusform><numerusform>Oczekiwanie na %n innych katalog?w?</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>Za chwil? rozpocznie si? synchronizacja</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>Oczekiwanie na %n inny katalog?</numerusform><numerusform>Oczekiwanie na %n inne katalogi?</numerusform><numerusform>Oczekiwanie na %n innych katalog?w?</numerusform><numerusform>Oczekiwanie na %n inny katalog(i)?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2778,11 +2861,6 @@
<translation>Ustawienia og?lne</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Uruchamiaj przy starcie systemu</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>Poka? powiadomienia po??cze?</translation>
@@ -2793,11 +2871,6 @@
<translation>W zasobniku systemowym</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>U?yj ikon &monochromatycznych</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>Poka? powiadomienia czatu</translation>
@@ -2813,17 +2886,32 @@
<translation>Zaawansowane</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Zapytaj o potwierdzenie przed synchronizacj? nowych katalog?w wi?kszych ni?</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Zapytaj o potwierdzenie przed synchronizacj? zewn?trznych magazyn?w</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Uruchamiaj przy starcie systemu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>U?yj ikon &monochromatycznych</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Zapytaj o potwierdzenie przed synchronizacj? nowych katalog?w wi?kszych ni?</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>Powiadamiaj, gdy zsynchronizowane katalogi osi?gn? rozmiar wi?kszy ni? okre?lony limit</translation>
@@ -2834,11 +2922,6 @@
<translation>Automatycznie wy??czaj synchronizacj? katalog?w, kt?re przekraczaj? limit</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Zapytaj o potwierdzenie przed synchronizacj? zewn?trznych magazyn?w</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>Przenie? usuni?te pliki do kosza</translation>
@@ -2890,11 +2973,6 @@
<translation>Kana? aktualizacji</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Uruchom ponownie i aktualizuj</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>&Automatycznie sprawdzaj dost?pno?? aktualizacji</translation>
@@ -2915,6 +2993,16 @@
<translation>Nota prawna</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation>Przywr?? &Domy?lne</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Uruchom ponownie i aktualizuj</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Powiadomienia serwera, kt?re wymagaj? uwagi.</translation>
@@ -2935,6 +3023,11 @@
<translation>Nie mo?na wy??czy? autostartu, poniewa? autostart ca?ego systemu jest w??czony.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation>Przywr?? do &%1</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>stabilny</translation>
@@ -3016,6 +3109,11 @@
<source>Debug archive is created at %1</source>
<translation>Archiwum debugowania jest utworzone w %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation>Usu? informacje uznane za poufne przed udost?pnieniem! Archiwum debugowania utworzone w %1</translation>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3180,102 +3278,97 @@
<translation>Nowa nazwa pliku</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Zmie? nazw? pliku</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>Plik "%1" nie m?g? zosta? zsynchronizowany, poniewa? nazwa zawiera znaki, kt?re nie s? dozwolone w tym systemie.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>Nast?puj?ce znaki nie s? dozwolone w systemie: * " | & ? , ; : \ / ~ < > spacje poprzedzaj?ce/ko?cowe</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
- <translation type="unfinished"/>
+ <translation>Nast?puj?ce znaki nie s? dozwolone w systemie: \ / : ? * " < > | spacje przoduj?ce/ko?cowe</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>Nie mo?na zsynchronizowa? pliku "%1", poniewa? jego nazwa zawiera znaki niedozwolone na serwerze.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>Nast?puj?ce znaki s? niedozwolone: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>Nast?puj?ce nazwy bazowe s? niedozwolone: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>Nast?puj?ce nazwy plik?w s? niedozwolone: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>Nast?puj?ce rozszerzenia plik?w s? niedozwolone: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Sprawdzanie uprawnienia do zmiany nazwy?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>Nie masz uprawnie? do zmiany nazwy tego pliku. Popro? autora pliku o zmian? jego nazwy.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>Nie uda?o si? pobra? uprawnie? z b??dem %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>Nazwa pliku zawiera spacje poprzedzaj?ce i ko?cowe.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>Nazwa pliku zawiera spacje poprzedzaj?ce.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>Nazwa pliku zawiera spacje ko?cowe.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>U?yj nieprawid?owej nazwy</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>Nazwa pliku zawiera niedozwolone znaki: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>Nie uda?o si? zmieni? nazwy pliku. Upewnij si?, ?e masz po??czenie z serwerem.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>Nie mo?na zmieni? nazwy pliku, poniewa? plik o tej nazwie ju? istnieje na serwerze. Wybierz inn? nazw?.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>Nie uda?o si? zmieni? nazwy pliku lokalnego. %1</translation>
</message>
@@ -3399,16 +3492,6 @@
<translation><p>Dost?pna jest nowa wersja klienta %1.</p><p><b>%2</b> jest dost?pny do pobrania. Zainstalowana wersja to %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Pomi? tym razem</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Pobierz aktualizacj?</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>Aktualizacja nie powiod?a si?</translation>
@@ -3433,6 +3516,16 @@
<source>Update manually</source>
<translation>Aktualizuj r?cznie</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Pomi? tym razem</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Pobierz aktualizacj?</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3457,6 +3550,23 @@
<translation>Serwer proxy wymaga uwierzytelnienia</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Przepustowo?? pobierania</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Limit do</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBajt?w/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>Uwaga: ustawienia proxy nie maj? wp?ywu na konta na ho?cie lokalnym</translation>
@@ -3479,46 +3589,29 @@
<translation>U?yj ustawie? globalnych</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Przepustowo?? pobierania</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Brak limitu</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBajt?w/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Limit do</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Ogranicz do 3/4 szacowanej przepustowo?ci</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Przepustowo?? wysy?ania</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Limit automatyczny</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Przepustowo?? wysy?ania</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Nazwa hosta serwera proxy</translation>
@@ -3547,6 +3640,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>Nie mo?na sprawdzi? nowych aktualizacji.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Sprawdzanie serwera aktualizacji?</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>Nowa aktualizacja %1 jest gotowa</translation>
@@ -3577,11 +3680,6 @@
<translation>Nie uda?o si? pobra? aktualizacji. Otw?rz %1, aby r?cznie pobra? aktualizacj?.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>Nie mo?na sprawdzi? nowych aktualizacji.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>Dost?pny jest nowy %1. Kliknij <a href='%2'>%2</a>, aby pobra? aktualizacj?.</translation>
@@ -3592,16 +3690,21 @@
<translation>Dost?pny jest nowy %1. Otw?rz %2, aby pobra? aktualizacj?.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Sprawdzanie serwera aktualizacji?</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Status aktualizacji jest nieznany. Nie sprawdzono dost?pno?ci nowych aktualizacji.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation>U?ywasz kana?u aktualizacji %1. Twoja instalacja ma najnowsz? wersj?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation>Brak dost?pnych aktualizacji. Posiadasz najnowsz? wersj?.</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Brak dost?pnych aktualizacji. Twoja instalacja jest w najnowszej wersji.</translation>
@@ -3777,11 +3880,6 @@
<translation><font color="green">Udane po??czenie z %1: %2 wersja %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>Nieprawid?owy adres URL</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Nie uda?o si? po??czy? do %1 w %2:<br/>%3</translation>
@@ -3792,6 +3890,16 @@
<translation>Przekroczono limit czasu podczas pr?by po??czenia do %1 na %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Dost?p zabroniony przez serwer. Aby sprawdzi?, czy masz odpowiednie uprawnienia, <a href="%1">kliknij tutaj</a>, aby po??czy? si? z us?ug? poprzez przegl?dark?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>Nieprawid?owy adres URL</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Pr?ba po??czenia z %1 w %2?</translation>
@@ -3802,11 +3910,6 @@
<translation>Uwierzytelnione zapytanie do serwera zosta?o przekierowane do "%1". Adres URL jest nieprawid?owy, serwer zosta? ?le skonfigurowany.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Dost?p zabroniony przez serwer. Aby sprawdzi?, czy masz odpowiednie uprawnienia, <a href="%1">kliknij tutaj</a>, aby po??czy? si? z us?ug? poprzez przegl?dark?.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>Wyst?pi?a nieprawid?owa odpowied? na ??danie uwierzytelnienia WebDav</translation>
@@ -4018,64 +4121,36 @@
<translation>Nazwy plik?w ko?cz?ce si? kropk? nie s? obs?ugiwane w tym systemie plik?w.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Katalog</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Plik</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
- <translation type="unfinished"/>
+ <translation>Nazwy katalog?w zawieraj?ce znak "%1" nie s? obs?ugiwane w tym systemie plik?w.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>Nazwa %1 zawieraj?ca znak "%2" nie jest obs?ugiwana w tym systemie plik?w.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
- <translation type="unfinished"/>
+ <translation>Nazwy plik?w zawieraj?ce znak "%1" nie s? obs?ugiwane w tym systemie plik?w.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>Nazwa %1 zawiera co najmniej jeden nieprawid?owy znak</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>Nazwa %1 jest nazw? zastrze?on? w tym systemie plik?w.</translation>
+ <translation>Nazwa katalogu zawiera co najmniej jeden nieprawid?owy znak</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>Nazwa pliku zawiera co najmniej jeden nieprawid?owy znak</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
+ <translation>Nazwa katalogu jest nazw? zastrze?on? w tym systemie plik?w.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
+ <translation>Nazwa pliku jest nazw? zastrze?on? w tym systemie plik?w.</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="433"/>
@@ -4083,6 +4158,24 @@
<translation>Nazwa pliku zawiera spacje na ko?cu.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Katalog</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Plik</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>Nazwa %1 zawieraj?ca znak "%2" nie jest obs?ugiwana w tym systemie plik?w.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4091,6 +4184,16 @@
<translation>Nie mo?na zmieni? nazwy lub wys?a?.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>Nazwa %1 zawiera co najmniej jeden nieprawid?owy znak</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>Nazwa %1 jest nazw? zastrze?on? w tym systemie plik?w.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>Nazwa pliku zawiera spacje poprzedzaj?ce.</translation>
@@ -4181,64 +4284,74 @@
<translation>Serwer zg?osi? brak %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Nie mo?na zsynchronizowa? z powodu nieprawid?owego czasu modyfikacji</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation>Wys?anie %1 przekracza %2 miejsca dost?pnego w plikach osobistych.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation>Wys?anie pliku %1 przekracza %2 miejsca dost?pnego w katalogu %3.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>Nie mo?na przes?a? pliku, poniewa? jest on otwarty w ?%1?.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>B??d podczas usuwania rekordu pliku %1 z bazy danych</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>Przeniesiono do nieprawid?owego obiektu, przywracanie</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>Nie mo?na zmodyfikowa? zaszyfrowanego elementu, poniewa? wybrany certyfikat jest nieprawid?owy.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorowane z powodu czarnej listy "Wybierz co synchronizowa?"</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Niedozwolone, poniewa? nie masz uprawnie? do dodawania podkatalog?w do tego katalogu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Niedozwolone, poniewa? nie masz uprawnie? do dodawania plik?w w tym katalogu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Wysy?anie niedozwolone, poniewa? plik jest tylko do odczytu na serwerze, przywracanie</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>Brak uprawnie? by usun??, przywracanie</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>B??d podczas odczytu bazy danych</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>Serwer odpowiedzia? z b??dem podczas odczytu katalogu "%1" : %2</translation>
</message>
@@ -4246,38 +4359,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>Nie mo?na usun?? pliku %1 z lokalnej bazy danych</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>B??d podczas aktualizacji metadanych z powodu nieprawid?owego czasu modyfikacji</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>Nie mo?na ustawi? katalogu %1 jako tylko do odczytu: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>nieznany wyj?tek</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>B??d podczas aktualizowania metadanych: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>Plik jest aktualnie u?ywany</translation>
</message>
@@ -4295,12 +4408,6 @@
<translation>Nie mo?na pobra? pliku %1 z powodu braku informacji o szyfrowaniu.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>W trakcie wyszukiwania plik uleg? zmianie</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4357,6 +4464,12 @@
<source>The file %1 is currently in use</source>
<translation>Plik %1 jest aktualnie u?ywany</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>W trakcie wyszukiwania plik uleg? zmianie</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4374,39 +4487,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>nie mo?na usun?? pliku %1, b??d: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>Nie mo?na utworzy? katalogu %1 z powodu konfliktu nazwy lokalnego pliku lub katalogu!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>Nie mo?na utworzy? katalogu %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>Nie mo?na ustawi? katalogu %1 jako tylko do odczytu: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>nieznany wyj?tek</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>B??d podczas aktualizowania metadanych: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>Plik %1 jest aktualnie u?ywany</translation>
</message>
@@ -4419,14 +4532,14 @@
<translation>Nie mo?na usun?? %1 z powodu kolizji z lokaln? nazw? pliku</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation>Tymczasowy b??d podczas usuwania lokalnego elementu usuni?tego z serwera.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Nie mo?na usun?? rekordu pliku %1 z lokalnej bazy danych</translation>
</message>
@@ -4434,49 +4547,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>Nie mo?na zmieni? nazwy katalogu %1 ze wzgl?du na konflikt nazw plik?w lokalnych lub katalog?w!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>Plik %1 zosta? pobrany, ale spowodowa?o to lokaln? kolizj? nazwy pliku!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>Nie mo?na pobra? pliku %1 z lokalnej bazy danych</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>B??d podczas ustawiania stanu przypi?cia</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>B??d podczas aktualizowania metadanych: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>Plik %1 jest aktualnie u?ywany</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>Nie uda?o si? rozszerzy? zmiany nazwy katalogu w hierarchii</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Nie uda?o si? zmieni? nazwy pliku</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Nie mo?na usun?? rekordu pliku %1 z lokalnej bazy danych</translation>
</message>
@@ -4533,39 +4646,39 @@
<translation>Nie mo?na zmieni? nazwy %1 na %2, b??d: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>B??d podczas aktualizowania metadanych: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>Plik %1 jest aktualnie u?ywany</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Serwer zwr?ci? nieprawid?owy kod HTTP. Oczekiwano 201, a otrzymano "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>Nie mo?na pobra? pliku %1 z lokalnej bazy danych</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Nie mo?na usun?? rekordu pliku %1 z lokalnej bazy danych</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>B??d podczas ustawiania stanu przypi?cia</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>B??d zapisu metadanych do bazy danych</translation>
</message>
@@ -4573,22 +4686,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>Nie uda?o si? wys?a? zaszyfrowanego pliku.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>Plik %1 nie mo?e zosta? wys?any, poniewa? istnieje inny plik o tej samej nazwie.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>Wys?anie %1 przekracza limit dla katalogu</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4596,11 +4698,6 @@
<translation>Plik %1 ma nieprawid?owy czas modyfikacji. Nie wysy?aj na serwer.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Plik usuni?to (rozpocz?to wysy?anie) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Plik lokalny zmieniony podczas synchronizacji. Zostanie wznowiony.</translation>
@@ -4630,6 +4727,22 @@
<source>The file %1 is currently in use</source>
<translation>Plik %1 jest aktualnie u?ywany</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>Wys?anie %1 przekracza limit dla katalogu</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>Nie uda?o si? wys?a? zaszyfrowanego pliku.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Plik usuni?to (rozpocz?to wysy?anie) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4878,6 +4991,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Menu kontekstowe udost?pniania</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Co? Tobie udost?pni?em</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Opcje udost?pniania</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Wy?lij link prywatny e-mailem?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Kopiuj link prywatny do schowka</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>Nie uda?o si? zaszyfrowa? katalogu w "%1"</translation>
@@ -4912,43 +5051,17 @@
<translation>Nast?puj?cy katalog zosta? zaszyfrowany pomy?lnie: "%1"</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Menu kontekstowe udost?pniania</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Wybierz now? lokalizacj??</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Co? Tobie udost?pni?em</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Opcje udost?pniania</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Aktywno??</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Kopiuj link prywatny do schowka</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Wy?lij link prywatny e-mailem?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>Opu?? udost?pnienie</translation>
@@ -4964,11 +5077,6 @@
<translation>Udost?pnianie dalej tego katalogu jest niedozwolone</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Kopiuj link wewn?trzny</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>Zaszyfruj</translation>
@@ -4995,12 +5103,6 @@
<translation><numerusform>Wygasa za %1 minut?</numerusform><numerusform>Wygasa za %1 minuty</numerusform><numerusform>Wygasa za %1 minut</numerusform><numerusform>Wygasa za %1 minut</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Otw?rz w przegl?darce</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Rozwi?? konflikt?</translation>
@@ -5030,6 +5132,17 @@
<source>Delete</source>
<translation>Usu?</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Kopiuj link wewn?trzny</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Otw?rz w przegl?darce</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5131,13 +5244,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>To po??czenie NIE jest bezpieczne, poniewa? jest nieszyfrowane.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Wersja serwera: %1</translation>
@@ -5157,6 +5263,13 @@
<source>The connection is not secure</source>
<translation>Po??czenie nie jest bezpieczne</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>To po??czenie NIE jest bezpieczne, poniewa? jest nieszyfrowane.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5249,6 +5362,32 @@
<translation>%1 (pomini?ty z powodu wcze?niejszego b??du, pr?buj? ponownie %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Dost?pnych jest tylko %1, aby rozpocz??, potrzebujesz co najmniej %2</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>Nie mo?na otworzy? lub utworzy? lokalnej bazy danych synchronizacji. Upewnij si?, ?e masz dost?p do zapisu w katalogu synchronizacji.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Brak miejsca na dysku: Pomini?to pobieranie plik?w, kt?re zmniejszy?yby ilo?? wolnego miejsca poni?ej %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>Na serwerze nie ma wystarczaj?cej ilo?ci miejsca na niekt?re wys?ane pliki.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Nierozpoznany konflikt.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>Nie mo?na zaktualizowa? pliku: %1</translation>
@@ -5269,22 +5408,6 @@
<translation>Nie mo?na ustawi? rekordu pliku na lokaln? baz? danych: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Nierozpoznany konflikt.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Dost?pnych jest tylko %1, aby rozpocz??, potrzebujesz co najmniej %2</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>Nie mo?na otworzy? lub utworzy? lokalnej bazy danych synchronizacji. Upewnij si?, ?e masz dost?p do zapisu w katalogu synchronizacji.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>U?ywanie plik?w wirtualnych z przyrostkiem, lecz przyrostek nie jest ustawiony</translation>
@@ -5304,16 +5427,6 @@
<source>Cannot open the sync journal</source>
<translation>Nie mo?na otworzy? dziennika synchronizacji</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Brak miejsca na dysku: Pomini?to pobieranie plik?w, kt?re zmniejszy?yby ilo?? wolnego miejsca poni?ej %1.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>Na serwerze nie ma wystarczaj?cej ilo?ci miejsca na niekt?re wys?ane pliki.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5324,7 +5437,7 @@
<translation>Offline</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>Musisz zaakceptowa? warunki korzystania z us?ugi</translation>
</message>
@@ -5708,11 +5821,6 @@
<source>Less than a minute</source>
<translation>Mniej ni? minuta</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5720,20 +5828,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1 minuta</numerusform><numerusform>%1 minuty</numerusform><numerusform>%1 minut</numerusform><numerusform>%1 minut</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1 godzina</numerusform><numerusform>%1 godziny</numerusform><numerusform>%1 godzin</numerusform><numerusform>%1 godzin</numerusform></translation>
@@ -5748,6 +5846,21 @@
<source>%1 days</source>
<translation><numerusform>%1 dzie?</numerusform><numerusform>%1 dni</numerusform><numerusform>%1 dni</numerusform><numerusform>%1 dni</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation><numerusform>%n minuta</numerusform><numerusform>%n minuty</numerusform><numerusform>%n minut</numerusform><numerusform>%n minut</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n godzina</numerusform><numerusform>%n godziny</numerusform><numerusform>%n godzin</numerusform><numerusform>%n godzin</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n dzie?</numerusform><numerusform>%n dni</numerusform><numerusform>%n dni</numerusform><numerusform>%n dni</numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5890,6 +6003,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Prosz? si? zalogowa?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>Nie skonfigurowano ?adnych katalog?w synchronizacji.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Roz??czony z %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Niewspierana wersja serwera</translation>
@@ -5910,31 +6038,6 @@
<translation>Twoje konto %1 wymaga zaakceptowania warunk?w korzystania z us?ugi serwera. Zostaniesz przekierowany do %2, aby potwierdzi?, ?e je przeczyta?e? i si? z nimi zgadzasz.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Roz??czony z %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Roz??czony z kontami:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Konto %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Prosz? si? zalogowa?</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Synchronizacja konta jest wy??czona</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5956,11 +6059,6 @@
<translation>macOS VFS dla %1: Wyst?pi? problem.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>Nie skonfigurowano ?adnych katalog?w synchronizacji.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Sprawdzanie zmian w zdalnym "%1"</translation>
@@ -5971,6 +6069,21 @@
<translation>Sprawdzanie zmian w lokalnym "%1"</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Roz??czony z kontami:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Konto %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Synchronizacja konta jest wy??czona</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5979,11 +6092,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Katalog lokalny</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Nazwa u?ytkownika</translation>
@@ -6019,22 +6127,11 @@
<translation>Zapytaj o potwierdzenie przed synchronizacj? katalog?w wi?kszych ni?</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Zapytaj przed synchronizacj? zewn?trznych magazyn?w</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Wybierz co synchronizowa?</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Zachowaj dane lokalne</translation>
@@ -6049,6 +6146,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Wyczy?? katalog lokalny i rozpocznij czyst? synchronizacj?</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Wybierz co synchronizowa?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Katalog lokalny</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6089,6 +6202,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>w przysz?o?ci</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1m</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>teraz</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Jaki? czas temu</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6129,57 +6287,12 @@
<source>Synced %1</source>
<translation>Zsynchronizowano %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>w przysz?o?ci</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>teraz</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1m</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Jaki? czas temu</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation>B??d podczas usuwania pliku</translation>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>?cie?ki rozpoczynaj?ce si? znakiem '#' nie s? obs?ugiwane w trybie VFS.</translation>
@@ -6425,6 +6538,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>Otw?rz katalogi lokalne lub grupowe</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Otw?rz katalog lokalny</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Po??czony</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>Roz??czony</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>Otw?rz katalog lokalny "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>Otw?rz katalog grupy "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>Otw?rz %1 w eksploratorze plik?w</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>Menu grupy u?ytkownik?w i katalog?w lokalnych</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6614,16 +6770,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6638,6 +6784,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6871,16 +7027,16 @@
<translation>Wyst?pi? b??d podczas konfiguracji</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Przygotowanie do synchronizacji</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>Zatrzymywanie synchronizacji</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Przygotowanie do synchronizacji</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Synchronizacja wstrzymana</translation>
@@ -6939,4 +7095,17 @@
<translation>Zwolnij miejsce lokalne</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>W??cz szybk? synchronizacj?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>Szybka synchronizacja b?dzie synchronizowa? tylko zmiany w plikach i katalogach w katalogach, kt?re zosta?y zbadane. Mo?e to znacznie zwi?kszy? responsywno?? pocz?tkowej konfiguracji plik?w wirtualnych. Jednak spowoduje to zb?dne pobieranie plik?w przeniesionych do niezbadanego katalogu.</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_pt_BR.ts nextcloud-desktop-3.16.6/translations/client_pt_BR.ts
--- nextcloud-desktop-3.16.4/translations/client_pt_BR.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_pt_BR.ts 2025-06-18 22:57:35.000000000 +0200
@@ -53,7 +53,7 @@
<message>
<location filename="../src/gui/tray/CallNotificationDialog.qml" line="235"/>
<source>Answer Talk call notification</source>
- <translation>Atender a notifica??o de chamada do Talk</translation>
+ <translation>Atender ? notifica??o de chamada do Talk</translation>
</message>
<message>
<location filename="../src/gui/tray/CallNotificationDialog.qml" line="242"/>
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>Ativar sincroniza??o r?pida</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>A sincroniza??o r?pida sincronizar? apenas as altera??es em arquivos e pastas dentro de pastas que foram exploradas. Isto pode aumentar significativamente a capacidade de resposta na configura??o inicial de arquivos virtuais. No entanto, isso causar? downloads redundantes de arquivos movidos para uma pasta inexplorada.</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>Ativar arquivos virtuais</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation>Permitir a exclus?o de itens na Lixeira</translation>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -546,19 +538,21 @@
<location filename="../src/gui/accountmanager.cpp" line="232"/>
<source>%1 accounts were detected from a legacy desktop client.
Should the accounts be imported?</source>
- <translation>%1 contas foram detectadas em um cliente de desktop legado. As contas devem ser importadas?</translation>
+ <translation>%1 contas foram detectadas de um cliente de desktop legado.
+As contas devem ser importadas?</translation>
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="234"/>
<source>1 account was detected from a legacy desktop client.
Should the account be imported?</source>
- <translation>1 conta foi detectada em um cliente de desktop legado. A conta deve ser importada?</translation>
+ <translation>1 conta foi detectada de um cliente de desktop legado.
+A conta deve ser importada?</translation>
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
- <translation>Importa??o herdada</translation>
+ <translation>Importa??o de configura??es legadas</translation>
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="237"/>
@@ -571,41 +565,19 @@
<translation>Pular</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
- <translation>N?o foi poss?vel importar contas da configura??o do cliente herdado.</translation>
+ <translation>N?o foi poss?vel importar contas da configura??o de clientes legados.</translation>
</message>
</context>
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Espa?o de armazenamento:...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Pastas n?o marcadas ser?o <b>removidas</b> do seu sistema de arquivos local e n?o ser?o mais sincronizadas com este computador</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Cancelar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Aplicar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Conectado com <server> como <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Sincronizar tudo</translation>
@@ -636,6 +608,33 @@
<translation>Configura??es de conex?o</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Aplicar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Espa?o de armazenamento:...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Cancelar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Conectado com <server> como <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Nenhuma conta configurada.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>Criptografia de Ponta-a-ponta com Arquivos Virtuais </translation>
@@ -643,7 +642,7 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="101"/>
<source>You seem to have the Virtual Files feature enabled on this folder. At the moment, it is not possible to implicitly download virtual files that are end-to-end encrypted. To get the best experience with virtual files and end-to-end encryption, make sure the encrypted folder is marked with "Make always available locally".</source>
- <translation>Parece que o recurso Arquivos virtuais est? ativado nesta pasta. No momento, n?o ? poss?vel baixar implicitamente arquivos virtuais criptografados de ponta a ponta. Para obter a melhor experi?ncia com arquivos virtuais e criptografia de ponta a ponta, certifique-se de que a pasta criptografada esteja marcada com "Tornar sempre dispon?vel localmente". </translation>
+ <translation>Parece que o recurso Arquivos virtuais est? ativado nesta pasta. No momento, n?o ? poss?vel baixar implicitamente arquivos virtuais criptografados de ponta-a-ponta. Para obter a melhor experi?ncia com arquivos virtuais e criptografia de ponta-a-ponta, certifique-se de que a pasta criptografada esteja marcada com "Disponibilizar sempre localmente". </translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="109"/>
@@ -670,9 +669,9 @@
<b>Este processo n?o ? revers?vel. Tem certeza de que deseja prosseguir?</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Nenhuma conta configurada.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation>Esquecer a configura??o da criptografia</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -685,6 +684,11 @@
<translation>Mostrar mnem?nico</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation>A criptografia est? configurada. Lembre-se de <b>Criptografar</b> uma pasta para criptografar de ponta-a-ponta todos os novos arquivos adicionados a ela.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>Criptografia de Ponta-a-ponta foi ativado para essa conta</translation>
@@ -710,6 +714,13 @@
<translation>A pasta tem um erro de sincroniza??o. A criptografia desta pasta ser? poss?vel depois que ela for sincronizada com sucesso</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation>Voc? n?o pode criptografar esta pasta porque a criptografia de ponta-a-ponta ainda n?o est? configurada neste dispositivo.
+Voc? gostaria de fazer isso agora?</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -734,12 +745,6 @@
<translation>N?o foi poss?vel criptografar a pasta porque ela n?o existe mais </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Abrir pasta</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Criptografar</translation>
@@ -778,16 +783,6 @@
<translation>Reiniciar a sincroniza??o</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Retomar sincroniza??o</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Pausar sincroniza??o</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Remover conex?o de sincroniza??o de pastas</translation>
@@ -813,21 +808,11 @@
<translation>Falha na cria??o da pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>N?o foi poss?vel criar a pasta local <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar a Remo??o da Sincroniza??o de Pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Deseja realmente parar a sincroniza??o desta pasta <i>%1</i>?</p><p><b>Nota:</b> Isto <b>n?o</b> vai excluir qualquer arquivo.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Remover conex?o de sincroniza??o de pasta</translation>
@@ -861,24 +846,24 @@
<translation>Mnem?nico da criptografia de ponta-a-ponta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>Para proteger sua Identidade Criptogr?fica, n?s a criptografamos com um mnem?nico de 12 palavras do dicion?rio. Por favor, anote-os e mantenha-os seguros. Eles ser?o necess?rios para adicionar outros dispositivos ? sua conta (como seu celular ou computador).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation>Para proteger sua Identidade Criptogr?fica, n?s a criptografamos com um mnem?nico de 12 palavras do dicion?rio. Anote-o e mantenha-o em seguran?a. Voc? precisar? dele para configurar a sincroniza??o de pastas criptografadas em seus outros dispositivos.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>Desativar a criptografia de ponta-a-ponta</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation>Esquecer a criptografia de ponta-a-ponta neste dispositivo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>Desativar a criptografia de ponta-a-ponta para %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation>Deseja esquecer as configura??es de criptografia de ponta-a-ponta para %1 neste dispositivo?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>A remo??o da criptografia de ponta-a-ponta remover? os arquivos sincronizados localmente que est?o criptografados.<br>Os arquivos criptografados permanecer?o no servidor.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation>Esquecer a criptografia de ponta-a-ponta remover? os dados confidenciais e todos os arquivos criptografados deste dispositivo.<br>Mas os arquivos criptografados permanecer?o no servidor e em todos os seus outros dispositivos, se configurados.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -891,34 +876,44 @@
<translation>A opera??o de sincroniza??o est? ocorrendo.<br/>Deseja finaliz?-la?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) de %2 em uso. Algumas pastas, incluindo as montadas na rede ou pastas compartilhadas, podem ter limites diferentes.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 em uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 de %2 em uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>Migrar o certificado para um novo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Atualmente, n?o h? informa??o dispon?vel do uso de armazenamento.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>Existem pastas cujo tamanho aumentou al?m de %1MB: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 em uso</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation>A criptografia de ponta-a-ponta foi inicializada nesta conta com outro dispositivo.<br>Digite o mnem?nico ?nico para que as pastas criptografadas tamb?m sejam sincronizadas neste dispositivo.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 como %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>A criptografia de ponta-a-ponta foi habilitada nesta conta com outro dispositivo.<br>Ela pode ser ativada neste dispositivo inserindo seu mnem?nico.<br>Isso permitir? a sincroniza??o de pastas criptografadas existentes.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>A vers?o do servidor %1 n?o ? suportada! Prossiga por sua pr?pria conta e risco.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation>Esta conta oferece suporte ? criptografia de ponta-a-ponta, mas ela precisa ser configurada primeiro.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Configurar criptografia</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Esta conta suporta criptografia de ponta-a-ponta</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -936,79 +931,125 @@
<translation>O servidor %1 est? em modo de manuten??o.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>O servidor %1 est? sendo redirecionado ou sua conex?o est? atr?s de um portal cativo.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Desconectado de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Conectando a %1 ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Existem pastas que n?o foram sincronizadas porque s?o muito grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>N?o foi poss?vel conectar-se a %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Existem pastas que n?o foram sincronizadas porque s?o armazenamentos externos:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Erro na configura??o do servidor: %1 em %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Existem pastas que n?o foram sincronizadas porque s?o muito grandes ou s?o armazenamentos externos: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>Voc? precisa aceitar os termos de servi?o em %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Abrir pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Nenhuma conex?o %1 configurada.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Retomar sincroniza??o</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>Migrar o certificado para um novo</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Pausar sincroniza??o</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Existem pastas que n?o foram sincronizadas porque s?o muito grandes:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>N?o foi poss?vel criar a pasta local <i>%1</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Existem pastas que n?o foram sincronizadas porque s?o armazenamentos externos:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Deseja realmente parar a sincroniza??o desta pasta <i>%1</i>?</p><p><b>Nota:</b> Isto <b>n?o</b> vai excluir qualquer arquivo.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Existem pastas que n?o foram sincronizadas porque s?o muito grandes ou s?o armazenamentos externos: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>Para proteger sua Identidade Criptogr?fica, n?s a criptografamos com um mnem?nico de 12 palavras do dicion?rio. Por favor, anote-os e mantenha-os seguros. Eles ser?o necess?rios para adicionar outros dispositivos ? sua conta (como seu celular ou computador).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>Existem pastas cujo tamanho aumentou al?m de %1MB: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>Desativar a criptografia de ponta-a-ponta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>A criptografia de ponta-a-ponta foi habilitada nesta conta com outro dispositivo.<br>Ela pode ser ativada neste dispositivo inserindo seu mnem?nico.<br>Isso permitir? a sincroniza??o de pastas criptografadas existentes.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>Desativar a criptografia de ponta-a-ponta para %1?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Esta conta suporta criptografia de ponta-a-ponta</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>A remo??o da criptografia de ponta-a-ponta remover? os arquivos sincronizados localmente que est?o criptografados.<br>Os arquivos criptografados permanecer?o no servidor.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Configurar criptografia</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) de %2 em uso. Algumas pastas, incluindo as montadas na rede ou pastas compartilhadas, podem ter limites diferentes.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 de %2 em uso</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Atualmente, n?o h? informa??o dispon?vel do uso de armazenamento.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 como %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>A vers?o do servidor %1 n?o ? suportada! Prossiga por sua pr?pria conta e risco.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>O servidor %1 est? sendo redirecionado ou sua conex?o est? atr?s de um portal cativo.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Conectando a %1 ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>N?o foi poss?vel conectar-se a %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Erro na configura??o do servidor: %1 em %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>Voc? precisa aceitar os termos de servi?o em %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Nenhuma conex?o %1 configurada.</translation>
</message>
</context>
<context>
@@ -1123,11 +1164,6 @@
<translation>Certificado & Chave (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Navegar...</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Senha do certificado:</translation>
@@ -1138,6 +1174,11 @@
<translation>Um pacote pkcs12 criptografado ? altamente recomendado, pois uma c?pia ser? armazenada no arquivo de configura??o. </translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Navegar...</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Selecione um certificado</translation>
@@ -1188,46 +1229,47 @@
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 contas</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 conta</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 pastas</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 pasta</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
- <translation>Importa??o legada</translation>
+ <translation>Importa??o de configura??es legadas</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
- <translation>Importados %1 e %2 de um cliente de desktop legado. %3</translation>
+ <translation>%1 e %2 importados de um cliente de desktop legado.
+%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Erro acessando o arquivo de configura??o</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>Ocorreu um erro ao acessar o arquivo de configura??o em %1. Certifique-se de que o arquivo pode ser acessado por sua conta do sistema.</translation>
</message>
@@ -1269,6 +1311,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation>O arquivo foi alterado desde a descoberta</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation>N?o foi poss?vel excluir o registro de arquivo %1 do banco de dados local</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation>O arquivo %1 n?o pode ser baixado porque n?o ? virtual!</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation>N?o foi poss?vel obter o arquivo %1 do BD local</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation>O arquivo %1 n?o pode ser baixado porque faltam informa??es de criptografia.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation>Erro ao atualizar metadados: %1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation>O arquivo %1 est? sendo usado no momento</translation>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1276,6 +1357,11 @@
<translation>O arquivo %1 n?o pode ser carregado porque existe outro arquivo com o mesmo nome, diferindo apenas no uso de mai?sculas e min?sculas</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation>O arquivo cont?m espa?os inicias ou finais e n?o p?de ser renomeado</translation>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>O arquivo %1 possui data/hora de modifica??o inv?lida. N?o enviar ao servidor.</translation>
@@ -1480,7 +1566,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Ocorreu um erro ao escrever metadados no banco de dados</translation>
</message>
@@ -1610,21 +1696,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Deseja excluir o diret?rio <i>%1</i> e todo o seu conte?do permanentemente?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Deseja excluir o arquivo <i>%1</i> permanentemente?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Confirmar exclus?o</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1640,30 +1711,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Nenhuma conta Nextcloud configurada</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Deseja excluir o diret?rio <i>%1</i> e todo o seu conte?do permanentemente?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Erro de autentica??o. Nome de usu?rio ou senha errados.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Deseja excluir o arquivo <i>%1</i> permanentemente?</translation>
</message>
<message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Confirmar exclus?o</translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
+ <message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Tempo limite</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>As credenciais fornecidas n?o est?o corretas</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>O servidor configurado para este cliente ? muito antigo</translation>
@@ -1673,16 +1744,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor, atualize para a ?ltima vers?o e reinicie o cliente.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Erro de autentica??o. Nome de usu?rio ou senha errados.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Nenhuma conta Nextcloud configurada</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>As credenciais fornecidas n?o est?o corretas</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Erro ao cancelar exclus?o de um arquivo</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>Erro ao cancelar exclus?o de %1</translation>
</message>
@@ -1690,19 +1776,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Erro do servidor: a resposta PROPFIND n?o est? formatada em XML! </translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>Erro de configura??o de metadados criptografados!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>Erro de configura??o de metadados criptografados: a assinatura inicial do servidor est? vazia.</translation>
</message>
@@ -1710,27 +1796,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Erro ao abrir diret?rio %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Diret?rio n?o acess?vel no cliente, permiss?o negada </translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Diret?rio n?o encontrado: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>A codifica??o do nome do arquivo n?o ? v?lida </translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Erro ao ler o diret?rio %1</translation>
</message>
@@ -1970,14 +2056,9 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>A URL de polling n?o come?a com HTTPS. No entanto, a URL de login come?ava com HTTPS. N?o ser? poss?vel fazer login, pois isto pode ser um risco de seguran?a. Por favor contate seu administrador de sistemas.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>A URL do servidor n?o come?a com HTTPS. No entanto, a URL de login come?ava com HTTPS. N?o ser? poss?vel fazer login, pois isto pode ser um risco de seguran?a. Por favor contate seu administrador de sistemas.</translation>
+ <translation>O URL do servidor n?o come?a com HTTPS. No entanto, o URL de login come?ava com HTTPS. N?o ser? poss?vel fazer login, pois isto pode ser um risco de seguran?a. Por favor, contate seu administrador.</translation>
</message>
<message>
<location filename="../src/gui/creds/flow2auth.cpp" line="113"/>
@@ -1986,28 +2067,33 @@
<translation>Erro retornado do servidor: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>O URL de sondagem n?o come?a com HTTPS. No entanto, o URL de login come?ava com HTTPS. N?o ser? poss?vel fazer login, pois isto pode ser um risco de seguran?a. Por favor, contate seu administrador.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Ocorreu um erro ao acessar o endpoint "token": <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>N?o foi poss?vel analisar o JSON retornado do servidor: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>A resposta do servidor n?o continha todos os campos esperados</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation>A resposta do servidor n?o continha todos os campos esperados: <br><em>%1</em></translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>N?o foi poss?vel analisar o JSON retornado do servidor: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2024,7 +2110,7 @@
<message>
<location filename="../src/gui/wizard/flow2authwidget.cpp" line="166"/>
<source>Polling for authorization</source>
- <translation>Votando autoriza??o</translation>
+ <translation>Sondando autoriza??o</translation>
</message>
<message>
<location filename="../src/gui/wizard/flow2authwidget.cpp" line="171"/>
@@ -2050,6 +2136,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 foi removido.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 foi atualizado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 foi renomeado para %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 foi movido para %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation><numerusform>%1 e %n outro arquivo foram removidos.</numerusform><numerusform>%1 e %n outros arquivos foram removidos.</numerusform><numerusform>%1 e %n outros arquivos foram removidos.</numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>Por favor, escolha um local diferente. A pasta %1 n?o existe.</translation>
@@ -2065,17 +2179,6 @@
<translation>Por favor, escolha um local diferente. %1 n?o ? uma pasta leg?vel.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 e %n outro arquivo foram removidos.</numerusform><numerusform>%1 e %n outros arquivos foram removidos.</numerusform><numerusform>%1 e %n outros arquivos foram removidos.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 foi removido.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 e %n outro arquivo foram adicionados.</numerusform><numerusform>%1 e %n outros arquivos foram adicionados.</numerusform><numerusform>%1 e %n outros arquivos foram adicionados. </numerusform></translation>
@@ -2091,33 +2194,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 e %n outro arquivo foram atualizados.</numerusform><numerusform>%1 e %n outros arquivos foram atualizados.</numerusform><numerusform>%1 e %n outros arquivos foram atualizados.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 foi atualizado.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 foi renomeado para %2 e %n outro arquivo foi renomeado.</numerusform><numerusform>%1 foi renomeado para %2 e %n outros arquivos foram renomeados.</numerusform><numerusform>%1 foi renomeado para %2 e %n outros arquivos foram renomeados.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 foi renomeado para %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 foi movido para %2 e %n outro arquivo foi movido.</numerusform><numerusform>%1 foi movido para %2 e %n outros arquivos foram movidos.</numerusform><numerusform>%1 foi movido para %2 e %n outros arquivos foram movidos.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 foi movido para %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2154,68 +2240,68 @@
<translation>Atividade de Sincroniza??o</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>N?o foi poss?vel ler o arquivo de exclus?o do sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Uma nova pasta maior que %1 MB foi adicionada: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Uma pasta de um armazenamento externo foi adicionada.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor, v? ?s configura??es para selecion?-la se desejar baix?-la.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>Uma pasta ultrapassou o limite de tamanho de pasta definido de %1 MB: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>Continuar sincronizando</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>Parar de sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>A pasta %1 ultrapassou o limite de tamanho de pasta definido de %2MB.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>Deseja interromper a sincroniza??o desta pasta?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>A pasta %1 foi criada, mas foi exclu?da da sincroniza??o anteriormente. Dados dentro dela n?o ser?o sincronizados.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>O arquivo %1 foi criado, mas foi exclu?do da sincroniza??o anteriormente. N?o ser? sincronizado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2228,12 +2314,12 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>Falha no download do arquivo virtual com c?digo "%1", status "%2" e mensagem de erro "%3"</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2242,7 +2328,7 @@
Como alternativa, voc? pode restaurar todos os arquivos exclu?dos fazendo upload da pasta '%1' para o servidor.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2251,22 +2337,22 @@
Como alternativa, voc? pode restaurar todos os arquivos exclu?dos baixando-os do servidor.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>Remover todos os arquivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>Prosseguir com a Exclus?o</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>Restaurar Arquivos para o Servidor</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>Restaurar Arquivos do Servidor</translation>
</message>
@@ -2307,11 +2393,6 @@
<translation>N?o foi poss?vel redefinir o estado da pasta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>Um antigo log de dados de sincroniza??o "%1" foi encontrado, mas n?o p?de ser removido. Certifique-se de que nenhum aplicativo o esteja usando no momento. </translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation> (backup)</translation>
@@ -2322,6 +2403,11 @@
<translation> (backup %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>Um antigo log de dados de sincroniza??o "%1" foi encontrado, mas n?o p?de ser removido. Certifique-se de que nenhum aplicativo o esteja usando no momento. </translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Estado indefinido.</translation>
@@ -2392,16 +2478,6 @@
<translation>A solicita??o de sincroniza??o foi cancelada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Sincroniza??o pausada.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (Pausa na sincroniza??o) </translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>Por favor, escolha um local diferente. A pasta selecionada n?o ? valida.</translation>
@@ -2451,6 +2527,16 @@
Para resolver este problema: por favor, remova %1 de uma das contas e crie uma nova pasta de sincroniza??o.
Para usu?rios avan?ados: este problema pode estar relacionado a v?rios arquivos de banco de dados de sincroniza??o encontrados em uma pasta. Verifique em %1 se h? arquivos .sync_*.db desatualizados e n?o utilizados e remova-os.</translation>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Sincroniza??o pausada.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (Pausa na sincroniza??o) </translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2494,16 +2580,6 @@
<translation>Erro ao carregar a lista de pastas do servidor.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Buscando a lista de pastas do servidor?</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Existem conflitos n?o resolvidos. Clique para detalhes.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>O suporte a arquivos virtuais est? habilitado. </translation>
@@ -2545,16 +2621,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>Baixando %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>Arquivo %1 de %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Existem conflitos n?o resolvidos. Clique para detalhes.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>Baixando %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Buscando a lista de pastas do servidor?</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2601,21 +2692,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 de %2, arquivo %3 de %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>Arquivo %1 de %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>Esperando por %n outras pasta(s)?</numerusform><numerusform>Esperando por %n outras pasta(s)?</numerusform><numerusform>Esperando por %n outras pasta(s)?</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>Prestes a iniciar a sincroniza??o</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>Esperando por %n outras pasta(s)?</numerusform><numerusform>Esperando por %n outras pasta(s)?</numerusform><numerusform>Esperando por %n outras pasta(s)?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2731,7 +2817,7 @@
<message>
<location filename="../src/gui/folderwizard.cpp" line="609"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
- <translation>Arquivos virtuais n?o s?o suportados como parti??o raiz do Windows como pasta local. Escolha uma subpasta v?lida na letra da unidade. </translation>
+ <translation>Os arquivos virtuais n?o s?o compat?veis com as ra?zes da parti??o do Windows como pasta local. Escolha uma subpasta v?lida na letra da parti??o.</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="634"/>
@@ -2775,11 +2861,6 @@
<translation>Configura??o Geral</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Iniciar na Inicializa??o do Sistema</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>Exibir Notifica??es de Chamada</translation>
@@ -2787,12 +2868,7 @@
<message>
<location filename="../src/gui/generalsettings.ui" line="40"/>
<source>For System Tray</source>
- <translation>Para Bandeja do Sistema</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Usar ?cones &Monocrom?ticos</translation>
+ <translation>Para a ?rea de Notifica??o do Sistema</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
@@ -2810,17 +2886,32 @@
<translation>Avan?ado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Pedir confirma??o antes de sincronizar novas pastas maiores que</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Pedir confirma??o antes de sincronizar armazenamentos externos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Iniciar na Inicializa??o do Sistema</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Usar ?cones &Monocrom?ticos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Pedir confirma??o antes de sincronizar novas pastas maiores que</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>Notificar quando as pastas sincronizadas ultrapassarem o limite especificado</translation>
@@ -2831,11 +2922,6 @@
<translation>Desativar automaticamente a sincroniza??o de pastas que ultrapassam o limite</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Pedir confirma??o antes de sincronizar armazenamentos externos</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>Mover arquivos removidos para a lixeira</translation>
@@ -2853,7 +2939,7 @@
<message>
<location filename="../src/gui/generalsettings.ui" line="234"/>
<source>Server poll interval</source>
- <translation>Intervalo de pesquisa do servidor</translation>
+ <translation>Intervalo de sondagem do servidor</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="254"/>
@@ -2887,11 +2973,6 @@
<translation>Canal de atualiza??o</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Reiniciar && Atualizar</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>Verifica??o &autom?tica de atualiza??es</translation>
@@ -2912,6 +2993,16 @@
<translation>Not?cia Legal</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation>Restaurar Pa&dr?o</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Reiniciar && Atualizar</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Notifica??es do servidor que exigem aten??o.</translation>
@@ -2932,6 +3023,11 @@
<translation>Voc? n?o pode desativar a inicializa??o autom?tica porque a inicializa??o autom?tica em todo o sistema est? ativada.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation>Restaurar para &%1</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>est?vel</translation>
@@ -3013,6 +3109,11 @@
<source>Debug archive is created at %1</source>
<translation>Arquivo de depura??o ? criado ?s %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation>Reduza as informa??es consideradas confidenciais antes de compartilh?-las! Arquivo de depura??o criado em %1</translation>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3046,12 +3147,12 @@
<message>
<location filename="../src/gui/creds/httpcredentialsgui.cpp" line="62"/>
<source>Please enter %1 password:<br><br>Username: %2<br>Account: %3<br></source>
- <translation>Por favor, digite %1 senha:<br><br>Nome de Usu?rio: %2<br>Conta: %3<br></translation>
+ <translation>Por favor, digite a senha de %1:<br><br>Nome de Usu?rio: %2<br>Conta: %3<br></translation>
</message>
<message>
<location filename="../src/gui/creds/httpcredentialsgui.cpp" line="76"/>
<source>Reading from keychain failed with error: "%1"</source>
- <translation>A leitura das chaves falhou com o erro: "%1" </translation>
+ <translation>A leitura do chaveiro falhou com erro: "%1" </translation>
</message>
<message>
<location filename="../src/gui/creds/httpcredentialsgui.cpp" line="83"/>
@@ -3177,102 +3278,97 @@
<translation>Novo nome de arquivo </translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Renomear arquivo </translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>O arquivo "%1" n?o p?de ser sincronizado porque o nome cont?m caracteres que n?o s?o permitidos neste sistema.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>Os seguintes caracteres n?o s?o permitidos no sistema: * " | & ? , ; : \ / ~ < > espa?os iniciais/finais</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
- <translation type="unfinished"/>
+ <translation>Os seguintes caracteres n?o s?o permitidos no sistema: \ / : ? * " < > | espa?os iniciais/finais</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>O arquivo "%1" n?o p?de ser sincronizado porque o nome cont?m caracteres que n?o s?o permitidos no servidor.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>Os seguintes caracteres n?o s?o permitidos: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>Os seguintes nomes de base n?o s?o permitidos: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>Os seguintes nomes de arquivo n?o s?o permitidos: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>As seguintes extens?es de arquivo n?o s?o permitidas: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Verificando permiss?es de renomea??o ?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>Voc? n?o tem permiss?o para renomear este arquivo. Pe?a ao autor do arquivo para renome?-lo. </translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>Falha ao buscar permiss?es com erro %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>O nome do arquivo cont?m espa?os iniciais e finais.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>O nome do arquivo cont?m espa?os iniciais.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>O nome do arquivo cont?m espa?os finais.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>Usar nome inv?lido</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>O nome do arquivo cont?m caracteres ilegais: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>N?o foi poss?vel renomear o arquivo. Verifique se voc? est? conectado ao servidor. </translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>N?o ? poss?vel renomear o arquivo porque j? existe um arquivo com o mesmo nome no servidor. Por favor, escolha outro nome. </translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>N?o foi poss?vel renomear o arquivo local. %1</translation>
</message>
@@ -3293,7 +3389,7 @@
<message>
<location filename="../src/gui/legalnotice.cpp" line="55"/>
<source><p>Copyright 2017-2025 Nextcloud GmbH<br />Copyright 2012-2023 ownCloud GmbH</p></source>
- <translation><p>Copyright 2017-2025 Nextcloud GmbH<br />Copyright 2012-2023 ownCloud GmbH</p></translation>
+ <translation><p>Direitos autorais 2017-2025 Nextcloud GmbH<br />Direitos autorais 2012-2023 ownCloud GmbH</p></translation>
</message>
<message>
<location filename="../src/gui/legalnotice.cpp" line="58"/>
@@ -3320,13 +3416,14 @@
<message>
<location filename="../src/gui/logbrowser.cpp" line="64"/>
<source>Enable logging to temporary folder</source>
- <translation>Habilite o registro na pasta tempor?ria </translation>
+ <translation>Ativar o registro na pasta tempor?ria</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.cpp" line="70"/>
<source>This setting persists across client restarts.
Note that using any logging command line options will override this setting.</source>
- <translation>Essa configura??o persiste nas reinicializa??es do cliente. Observe que o uso de qualquer op??o de linha de comando de registro substituir? essa configura??o. </translation>
+ <translation>Esta configura??o persiste durante as reinicializa??es do cliente.
+Observe que o uso de qualquer op??o de logs na linha de comandos substituir? esta configura??o.</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.cpp" line="77"/>
@@ -3395,16 +3492,6 @@
<translation><p>Uma nova vers?o do Cliente %1 est? dispon?vel.</p><p><b>%2</b> est? dispon?vel para baixar. A vers?o instalada ? a %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Pular desta vez</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Atualizar</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>Falha na atualiza??o</translation>
@@ -3429,6 +3516,16 @@
<source>Update manually</source>
<translation>Atualizar manualmente</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Pular desta vez</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Atualizar</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3453,14 +3550,31 @@
<translation>Servidor proxy requer autentica??o</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Banda de Download</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Limitar em</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
- <translation>Nota: as configura??es de proxy n?o t?m efeito para contas no host local </translation>
+ <translation>Observa??o: as configura??es de proxy n?o t?m efeito para contas no host local</translation>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="249"/>
<source>Manually specify proxy</source>
- <translation>Especifique manualmente o proxy</translation>
+ <translation>Especificar manualmente o proxy</translation>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="259"/>
@@ -3475,46 +3589,29 @@
<translation>Usar configura??es globais</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Banda de Download</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Sem limite</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Limitar em</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Limite a 3/4 da largura de banda estimada</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Banda de Upload</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Limitar automaticamente</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Banda de Upload</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Nome do servidor proxy</translation>
@@ -3543,9 +3640,19 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>N?o foi poss?vel verificar novas atualiza??es.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Verificando o servidor de atualiza??o...</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
- <translation>Nova atualiza??o %1 pronta </translation>
+ <translation>Nova atualiza??o %1 pronta</translation>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="108"/>
@@ -3565,7 +3672,7 @@
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="157"/>
<source>Could not download update. Please open <a href='%1'>%1</a> to download the update manually.</source>
- <translation>N?o foi poss?vel baixar a atualiza??o. Por favor abra <a href='%1'>%1</a>para baixar a atualiza??o manualmente. </translation>
+ <translation>N?o foi poss?vel baixar a atualiza??o. Por favor, abra <a href='%1'>%1</a> para baixar a atualiza??o manualmente.</translation>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="159"/>
@@ -3573,14 +3680,9 @@
<translation>N?o foi poss?vel baixar a atualiza??o. Por favor, abra %1 para baixar a atualiza??o manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>N?o foi poss?vel verificar novas atualiza??es.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
- <translation>Novo %1 est? dispon?vel. Por favor Abra <a href='%2'>%2</a> para baixar a atualiza??o.</translation>
+ <translation>Novo %1 est? dispon?vel. Por favor, abra <a href='%2'>%2</a> para baixar a atualiza??o.</translation>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="167"/>
@@ -3588,16 +3690,21 @@
<translation>Novo %1 est? dispon?vel. Por favor, abra %2 para baixar a atualiza??o.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Verificando o servidor de atualiza??o...</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Status de atualiza??o desconhecida: N?o foram verificadas novas atualiza??es.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation>Voc? est? usando o canal de atualiza??o %1. Sua instala??o ? a vers?o mais recente.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation>N?o h? atualiza??es dispon?veis. Sua instala??o ? a vers?o mais recente.</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>N?o h? atualiza??es dispon?veis. Sua instala??o ? a vers?o mais recente.</translation>
@@ -3625,17 +3732,17 @@
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="127"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="286"/>
<source>Use &virtual files instead of downloading content immediately %1</source>
- <translation>Use os arquivos &virtuais em vez de baixar o conte?do imediatamente %1 </translation>
+ <translation>Use arquivos &virtuais em vez de fazer o download imediato do conte?do %1 </translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Virtual files are not supported for Windows partition roots as local folder. Please choose a valid subfolder under drive letter.</source>
- <translation>Arquivos virtuais n?o s?o suportados como parti??o raiz do Windows como pasta local. Escolha uma subpasta v?lida na letra da unidade. </translation>
+ <translation>Os arquivos virtuais n?o s?o compat?veis com as ra?zes da parti??o do Windows como pasta local. Escolha uma subpasta v?lida na letra da parti??o.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="319"/>
<source>%1 folder "%2" is synced to local folder "%3"</source>
- <translation>%1 pasta "%2" est? sincronizada com a pasta local "%3" </translation>
+ <translation>Pasta de %1 "%2" est? sincronizada com a pasta local "%3" </translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="322"/>
@@ -3645,7 +3752,7 @@
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="327"/>
<source>Warning: The local folder is not empty. Pick a resolution!</source>
- <translation>Aviso: A pasta local n?o est? vazia. Escolha uma op??o!</translation>
+ <translation>Aviso: A pasta local n?o est? vazia. Escolha uma resolu??o!</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="340"/>
@@ -3773,11 +3880,6 @@
<translation><font color="green">Conectado com sucesso a %1: %2 vers?o %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>URL inv?lida</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Falhou ao conectar com %1 em %2:<br/>%3</translation>
@@ -3788,6 +3890,16 @@
<translation>Atingido o tempo limite ao tentar conectar com %1 em %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Acesso proibido pelo servidor. Para verificar se voc? tem acesso adequado, <a href="%1">clique aqui</a> para acessar o servi?o com seu navegador.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>URL inv?lida</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Tentando conectar em %1 ?s %2?</translation>
@@ -3798,11 +3910,6 @@
<translation>A solicita??o autenticada para o servidor foi redirecionada para "%1". O URL est? incorreto, o servidor est? configurado incorretamente. </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Acesso proibido pelo servidor. Para verificar se voc? tem acesso adequado, <a href="%1">clique aqui</a> para acessar o servi?o com seu navegador.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>Houve uma resposta inv?lida para uma solicita??o autenticada do WebDAV</translation>
@@ -3902,7 +4009,7 @@
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="667"/>
<source>Cannot remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
- <translation>N?o foi poss?vel remover e fazer o backup da pasta porque a pasta ou algum arquivo presente dentro desta pasta est? aberto em outro programa. Por favor feche o arquivo ou a pasta e tente novamente ou cancele a opera??o.</translation>
+ <translation>N?o foi poss?vel remover e fazer o backup da pasta porque a pasta ou algum arquivo presente dentro desta pasta est? aberto em outro programa. Por favor, feche o arquivo ou a pasta e tente novamente ou cancele a opera??o.</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="696"/>
@@ -3930,7 +4037,7 @@
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="104"/>
<source>Add %1 account</source>
- <translation>Adicionar conta %1</translation>
+ <translation>Adicionar conta de %1</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="108"/>
@@ -3956,10 +4063,9 @@
Switching to this mode will abort any currently running synchronization.
This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
- <translation>
-Quando o modo "arquivos virtuais" est? habilitado, nenhum arquivo ser? baixado inicialmente. Em vez disso, um min?sculo arquivo "% 1" ser? criado para cada arquivo existente no servidor. O conte?do pode ser baixado executando esses arquivos ou usando seu menu de contexto.
+ <translation>Quando o modo "arquivos virtuais" est? habilitado, nenhum arquivo ser? baixado inicialmente. Em vez disso, ser? criado um pequeno arquivo de "%1" para cada arquivo existente no servidor. O conte?do pode ser baixado executando estes arquivos ou usando seu menu de contexto.
-O modo de arquivos virtuais ? mutuamente exclusivo com sincroniza??o seletiva. As pastas n?o selecionadas no momento ser?o traduzidas para pastas somente online e suas configura??es de sincroniza??o seletiva ser?o redefinidas.
+O modo de arquivos virtuais ? mutuamente exclusivo com sincroniza??o seletiva. As pastas atualmente n?o selecionadas ser?o convertidas em pastas somente on-line e suas configura??es de sincroniza??o seletiva ser?o redefinidas.
Mudar para este modo abortar? qualquer sincroniza??o em execu??o.
@@ -3968,7 +4074,7 @@
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="506"/>
<source>Enable experimental placeholder mode</source>
- <translation>Ativar modo de marcador de posi??o experimental </translation>
+ <translation>Ativar o modo de espa?o reservado experimental</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="507"/>
@@ -3986,7 +4092,7 @@
<message>
<location filename="../src/gui/passwordinputdialog.ui" line="35"/>
<source>Please enter a password for your share:</source>
- <translation>Por favor digite uma senha para o seu compartilhamento:</translation>
+ <translation>Por favor, digite uma senha para seu compartilhamento:</translation>
</message>
</context>
<context>
@@ -3994,7 +4100,7 @@
<message>
<location filename="../src/libsync/propagateupload.cpp" line="149"/>
<source>Invalid JSON reply from the poll URL</source>
- <translation>Resposta JSON inv?lida do conjunto de URL</translation>
+ <translation>Resposta JSON inv?lida do UR de sondagem</translation>
</message>
</context>
<context>
@@ -4007,77 +4113,67 @@
<message>
<location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File is listed on the ignore list.</source>
- <translation>O arquivo est? listado na lista de ignorados. </translation>
+ <translation>O arquivo est? listado na lista de ignorados.</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File names ending with a period are not supported on this file system.</source>
- <translation>File names ending with a period are not supported on this file system.</translation>
+ <translation>Os nomes de arquivos que terminam com um ponto final n?o s?o compat?veis com esse sistema de arquivos.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Pasta</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Arquivo</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>O nome %1 contendo o caractere "%2" n?o ? suportado neste sistema de arquivos.</translation>
+ <translation>Os nomes de pastas que cont?m o caractere "%1" n?o s?o compat?veis com este sistema de arquivos.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
- <translation type="unfinished"/>
+ <translation>Os nomes de arquivos que cont?m o caractere "%1" n?o s?o compat?veis com este sistema de arquivos.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>O nome %1 cont?m pelo menos um car?cter inv?lido</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
- <translation type="unfinished"/>
+ <translation>O nome da pasta cont?m pelo menos um caractere inv?lido</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>%1 nome ? um nome reservado neste sistema de arquivos.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>O nome do arquivo cont?m pelo menos um caractere inv?lido </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
+ <translation>O nome da pasta ? um nome reservado neste sistema de arquivos.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
+ <translation>O nome do arquivo ? um nome reservado neste sistema de arquivos.</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="433"/>
<source>Filename contains trailing spaces.</source>
- <translation>O nome do arquivo cont?m espa?os deixados para tr?s . </translation>
+ <translation>O nome do arquivo cont?m espa?os finais. </translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Pasta</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Arquivo</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>O nome de %1 contendo o caractere "%2" n?o ? suportado neste sistema de arquivos.</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
@@ -4088,6 +4184,16 @@
<translation>N?o pode ser renomeado ou carregado.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>O nome de %1 cont?m pelo menos um caractere inv?lido</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>O nome de %1 ? um nome reservado neste sistema de arquivos.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>O nome do arquivo cont?m espa?os iniciais.</translation>
@@ -4105,32 +4211,32 @@
<message>
<location filename="../src/libsync/discovery.cpp" line="458"/>
<source>File/Folder is ignored because it's hidden.</source>
- <translation>Arquivo/pasta ser? ignorado porque est? oculto. </translation>
+ <translation>Arquivo/Pasta ser? ignorado porque est? oculto. </translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="461"/>
<source>Stat failed.</source>
- <translation>Stat falhou. </translation>
+ <translation>Stat falhou.</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="464"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
- <translation>Conflito: vers?o do servidor baixada, c?pia local renomeada e n?o carregada. </translation>
+ <translation>Conflito: Vers?o do servidor baixada, c?pia local renomeada e n?o carregada.</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="468"/>
<source>Case Clash Conflict: Server file downloaded and renamed to avoid clash.</source>
- <translation>Conflito de conflito de caso: arquivo do servidor baixado e renomeado para evitar conflitos.</translation>
+ <translation>Conflito de Letras Mai?sculas e Min?sculas: Arquivo do servidor baixado e renomeado para evitar conflitos.</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="472"/>
<source>The filename cannot be encoded on your file system.</source>
- <translation>O nome do arquivo n?o pode ser codificado em seu sistema de arquivos. </translation>
+ <translation>O nome do arquivo n?o pode ser codificado em seu sistema de arquivos.</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="475"/>
<source>The filename is blacklisted on the server.</source>
- <translation>O nome do arquivo est? na lista negra do servidor. </translation>
+ <translation>O nome do arquivo est? na lista negra do servidor.</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="478"/>
@@ -4140,7 +4246,7 @@
<message>
<location filename="../src/libsync/discovery.cpp" line="481"/>
<source>Reason: the filename has a forbidden base name (filename start).</source>
- <translation>Motivo: o nome do arquivo tem um nome base proibido (nome do arquivo inicial).</translation>
+ <translation>Motivo: o nome do arquivo tem um nome base proibido (in?cio do nome do arquivo).</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="484"/>
@@ -4150,12 +4256,12 @@
<message>
<location filename="../src/libsync/discovery.cpp" line="487"/>
<source>Reason: the filename contains a forbidden character (%1).</source>
- <translation>Raz?o: o nome do arquivo cont?m um caractere proibido (%1).</translation>
+ <translation>Motivo: o nome do arquivo cont?m um caractere proibido (%1).</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="635"/>
<source>File has extension reserved for virtual files.</source>
- <translation>O arquivo tem extens?o reservada para arquivos virtuais. </translation>
+ <translation>O arquivo tem uma extens?o reservada para arquivos virtuais. </translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="776"/>
@@ -4175,67 +4281,77 @@
<message>
<location filename="../src/libsync/discovery.cpp" line="786"/>
<source>Server reported no %1</source>
- <translation>Servidor relatou n?o %1</translation>
+ <translation>Servidor relatou nenhum %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
- <translation>N?o ? poss?vel sincronizar devido ao hor?rio de modifica??o inv?lido</translation>
+ <translation>N?o ? poss?vel sincronizar devido ? hora de modifica??o inv?lida</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation>O upload de %1 excede %2 de espa?o restante nos arquivos pessoais.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation>O upload de %1 excede %2 de espa?o restante na pasta %3.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>N?o foi poss?vel fazer upload do arquivo porque ele est? aberto em "%1".</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>Erro ao excluir o registro de arquivo %1 do banco de dados</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
- <translation>Movido para destino inv?lido, restaurando </translation>
+ <translation>Movido para destino inv?lido, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>N?o ? poss?vel modificar o item criptografado porque o certificado selecionado n?o ? v?lido.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorado devido ? lista negra "escolher o que sincronizar" </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>N?o permitido porque voc? n?o tem permiss?o para adicionar subpastas a essa pasta</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>N?o permitido porque voc? n?o tem permiss?o para adicionar arquivos nessa pasta </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
- <translation>N?o ? permitido fazer upload deste arquivo porque ele ? somente leitura no servidor, restaurando </translation>
+ <translation>N?o ? permitido fazer upload deste arquivo porque ele ? somente leitura no servidor, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>N?o tem permiss?o para remover, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Erro ao ler o banco de dados </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>O servidor respondeu com um erro ao ler o diret?rio "%1" : %2</translation>
</message>
@@ -4243,38 +4359,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>N?o foi poss?vel remover o arquivo %1 do BD local</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
- <translation>Erro ao atualizar os metadados devido a erro na data/hora modificada</translation>
+ <translation>Erro ao atualizar os metadados devido a uma hora de modifica??o inv?lida</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>A pasta %1 n?o pode ser tornada somente leitura: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>exce??o desconhecida</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Erro ao atualizar metadados: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>O arquivo est? em uso no momento</translation>
</message>
@@ -4284,7 +4400,7 @@
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="461"/>
<source>Could not get file %1 from local DB</source>
- <translation>N?o foi poss?vel obter de arquivo %1 do BD local</translation>
+ <translation>N?o foi poss?vel obter o arquivo %1 do BD local</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="478"/>
@@ -4292,12 +4408,6 @@
<translation>O arquivo %1 n?o pode ser baixado porque faltam informa??es de criptografia.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>O arquivo foi alterado desde a descoberta</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4331,7 +4441,7 @@
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="947"/>
<source>The downloaded file is empty, but the server said it should have been %1.</source>
- <translation>O arquivo baixado est? vazio, mas o servidor disse que deveria ser %1.</translation>
+ <translation>O arquivo baixado est? vazio, mas o servidor disse que ele deveria ter %1.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1210"/>
@@ -4354,6 +4464,12 @@
<source>The file %1 is currently in use</source>
<translation>O arquivo %1 est? em uso no momento</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>O arquivo foi alterado desde a descoberta</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4371,39 +4487,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>n?o foi poss?vel excluir o arquivo %1, erro: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>A pasta %1 n?o pode ser criado devido a um conflito de nome de pasta ou arquivo local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>N?o foi poss?vel criar a pasta %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>A pasta %1 n?o pode ser tornada somente leitura: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>exce??o desconhecida</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Erro ao atualizar metadados: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>O arquivo %1 est? em uso no momento</translation>
</message>
@@ -4416,14 +4532,14 @@
<translation>N?o foi poss?vel remover %1 devido a um conflito com o nome de um arquivo local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation>Erro tempor?rio ao remover item local removido do servidor.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>N?o foi poss?vel excluir o registro de arquivo %1 do BD local</translation>
</message>
@@ -4431,51 +4547,51 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>A pasta %1 n?o pode ser renomeada devido a um conflito de nome de arquivo ou pasta local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>Arquivo %1 baixado, mas resultou em um conflito de nome de arquivo local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
- <translation>N?o foi poss?vel obter de arquivo %1 do BD local</translation>
+ <translation>N?o foi poss?vel obter o arquivo %1 do BD local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Erro ao definir o estado do pin</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Erro ao atualizar metadados: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
- <translation>O arquivo %1 est? correntemente em uso</translation>
+ <translation>O arquivo %1 est? em uso no momento</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>Falha ao propagar a renomea??o do diret?rio na hierarquia</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Falha ao renomear arquivo </translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
- <translation>N?o foi poss?vel excluir o registro de arquivo %1 do BD local</translation>
+ <translation>N?o foi poss?vel excluir o registro do arquivo %1 do BD local</translation>
</message>
</context>
<context>
@@ -4488,7 +4604,7 @@
<message>
<location filename="../src/libsync/propagateremotedelete.cpp" line="132"/>
<source>Could not delete file record %1 from local DB</source>
- <translation>N?o foi poss?vel excluir o registro de arquivo %1 do BD local</translation>
+ <translation>N?o foi poss?vel excluir o registro do arquivo %1 do BD local</translation>
</message>
</context>
<context>
@@ -4509,17 +4625,17 @@
<message>
<location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Failed to encrypt a folder %1</source>
- <translation>N?o foi poss?vel encriptar uma pasta %1</translation>
+ <translation>Falha ao criptografar uma pasta %1</translation>
</message>
<message>
<location filename="../src/libsync/propagateremotemkdir.cpp" line="283"/>
<source>Error writing metadata to the database: %1</source>
- <translation>Erro ao gravar metadados no banco de dados: %1</translation>
+ <translation>Erro ao gravar metadados no banco de dados: %1</translation>
</message>
<message>
<location filename="../src/libsync/propagateremotemkdir.cpp" line="286"/>
<source>The file %1 is currently in use</source>
- <translation>O arquivo %1 est? atualmente em uso</translation>
+ <translation>O arquivo %1 est? em uso no momento</translation>
</message>
</context>
<context>
@@ -4527,42 +4643,42 @@
<message>
<location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
- <translation>N?o foi poss?vel renomear %1 para %2, erro: %3</translation>
+ <translation>N?o foi poss?vel renomear %1 para %2, erro: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Erro ao atualizar metadados: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
- <translation>O arquivo %1 est? correntemente em uso</translation>
+ <translation>O arquivo %1 est? em uso no momento</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>C?digo HTTP errado retornado pelo servidor. 201 esperado, mas recebeu "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
- <translation>N?o foi poss?vel obter de arquivo %1 do BD local</translation>
+ <translation>N?o foi poss?vel obter o arquivo %1 do BD local</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
- <translation>N?o foi poss?vel excluir o registro de arquivo %1 do BD local</translation>
+ <translation>N?o foi poss?vel excluir o registro do arquivo %1 do BD local</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
- <translation>Erro ao definir o estado do pin </translation>
+ <translation>Erro ao definir o estado do pin</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Ocorreu um erro ao escrever metadados no banco de dados</translation>
</message>
@@ -4570,32 +4686,16 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>Falha ao fazer upload do arquivo criptografado. </translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>O arquivo %1 n?o p?de ser enviado porque um outro arquivo com o mesmo nome, diferenciando apenas letras mai?sculas e min?sculas, existe</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>O upload de %1 excede a cota para a pasta</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
<source>File %1 has invalid modification time. Do not upload to the server.</source>
- <translation>O arquivo %1 tem hora de modifica??o inv?lida. N?o envie para o servidor.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Arquivo Removido (iniciar upload) %1</translation>
+ <translation>O arquivo %1 tem uma hora de modifica??o inv?lida. N?o fazendo upload para o servidor.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
@@ -4610,12 +4710,12 @@
<message>
<location filename="../src/libsync/propagateupload.cpp" line="462"/>
<source>Failed to unlock encrypted folder.</source>
- <translation>Falha ao desbloquear a pasta criptografada. </translation>
+ <translation>Falha ao desbloquear a pasta criptografada.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="735"/>
<source>Unable to upload an item with invalid characters</source>
- <translation>Unable to upload an item with invalid characters</translation>
+ <translation>N?o ? poss?vel carregar um item com caracteres inv?lidos</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="837"/>
@@ -4625,7 +4725,23 @@
<message>
<location filename="../src/libsync/propagateupload.cpp" line="840"/>
<source>The file %1 is currently in use</source>
- <translation>O arquivo %1 est? correntemente em uso</translation>
+ <translation>O arquivo %1 est? em uso no momento</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>O upload de %1 excede a cota para a pasta</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>Falha ao fazer upload do arquivo criptografado.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Arquivo Removido (iniciar upload) %1</translation>
</message>
</context>
<context>
@@ -4643,7 +4759,7 @@
<message>
<location filename="../src/libsync/propagateuploadng.cpp" line="515"/>
<source>Poll URL missing</source>
- <translation>Falta o URL da enquete</translation>
+ <translation>Falta o URL de sondagem</translation>
</message>
<message>
<location filename="../src/libsync/propagateuploadng.cpp" line="524"/>
@@ -4666,7 +4782,7 @@
<message>
<location filename="../src/libsync/propagateuploadv1.cpp" line="236"/>
<source>Poll URL missing</source>
- <translation>Faltando conjunto de URL</translation>
+ <translation>Falta o URL de sondagem</translation>
</message>
<message>
<location filename="../src/libsync/propagateuploadv1.cpp" line="260"/>
@@ -4824,12 +4940,12 @@
<message>
<location filename="../src/gui/filedetails/sharemodel.cpp" line="757"/>
<source>Share link</source>
- <translation>Compartilhar link</translation>
+ <translation>Link do compartilhamento</translation>
</message>
<message>
<location filename="../src/gui/filedetails/sharemodel.cpp" line="765"/>
<source>Link share</source>
- <translation>Link para compartilhar</translation>
+ <translation>Compartilhamento por link</translation>
</message>
<message>
<location filename="../src/gui/filedetails/sharemodel.cpp" line="767"/>
@@ -4875,6 +4991,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Compartilhamento do menu de contexto</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Eu compartilhei algo com voc?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Op??es de compartilhamento</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Enviar link privado por e-mail...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Copiar link privado para a ?rea de transfer?ncia</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>Falha ao criptografar a pasta em "%1"</translation>
@@ -4882,7 +5024,7 @@
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="552"/>
<source>The account %1 does not have end-to-end encryption configured. Please configure this in your account settings to enable folder encryption.</source>
- <translation>A conta %1 n?o tem criptografia de ponta a ponta configurada. Configure isso nas configura??es da sua conta para habilitar a criptografia de pastas.</translation>
+ <translation>A conta %1 n?o tem criptografia de ponta-a-ponta configurada. Configure isso nas configura??es da sua conta para ativar a criptografia de pastas.</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="571"/>
@@ -4909,43 +5051,17 @@
<translation>A seguinte pasta foi criptografada com sucesso: "%1"</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Compartilhamento do menu de contexto</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Selecionar novo local...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Eu compartilhei algo com voc?</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Op??es de compartilhamento</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Atividade</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Copiar link privado para a ?rea de transfer?ncia</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Enviar link privado por e-mail...</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>Sair deste compartilhamento</translation>
@@ -4958,12 +5074,7 @@
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1182"/>
<source>Resharing this folder is not allowed</source>
- <translation>Compartilhar de novo esta pasta n?o ? permitido </translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Copiar link interno</translation>
+ <translation>N?o ? permitido o recompartilhamento desta pasta</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
@@ -4992,12 +5103,6 @@
<translation><numerusform>Expira em %1 minuto</numerusform><numerusform>Expira em %1 minutos</numerusform><numerusform>Expira em %1 minutos</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Abrir no navegador</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Resolver conflito?</translation>
@@ -5027,6 +5132,17 @@
<source>Delete</source>
<translation>Excluir</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Copiar link interno</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Abrir no navegador</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5128,13 +5244,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Esta conex?o N?O ? segura, uma vez que n?o ? criptografada.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Vers?o do servidor: %1</translation>
@@ -5154,6 +5263,13 @@
<source>The connection is not secure</source>
<translation>A conex?o n?o ? segura</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Esta conex?o N?O ? segura, uma vez que n?o ? criptografada.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5246,24 +5362,25 @@
<translation>%1 (ignorado devido a um erro anterior, tentando novamente em %2)</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="383"/>
- <source>Could not update file: %1</source>
- <translation>N?o foi poss?vel atualizar o arquivo: %1</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Apenas %1 est? dispon?vel, ? preciso pelo menos %2 para come?ar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="412"/>
- <source>Could not update virtual file metadata: %1</source>
- <translation>N?o foi poss?vel atualizar os metadados do arquivo virtual: %1</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>N?o ? poss?vel abrir ou criar o banco de dados de sincroniza??o local. Certifique-se de ter acesso de grava??o na pasta de sincroniza??o.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="419"/>
- <source>Could not update file metadata: %1</source>
- <translation>N?o foi poss?vel atualizar os metadados do arquivo: %1</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>O espa?o em disco ? pequeno: Os downloads que reduziriam o espa?o livre abaixo de %1 foram ignorados.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="433"/>
- <source>Could not set file record to local DB: %1</source>
- <translation>N?o foi poss?vel definir o registro do arquivo para o BD local: %1</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>N?o h? espa?o dispon?vel no servidor para alguns uploads.</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="465"/>
@@ -5271,15 +5388,24 @@
<translation>Conflito n?o solucionado.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Apenas %1 est? dispon?vel, ? preciso pelo menos %2 para come?ar</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="383"/>
+ <source>Could not update file: %1</source>
+ <translation>N?o foi poss?vel atualizar o arquivo: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>N?o ? poss?vel abrir ou criar o banco de dados de sincroniza??o local. Certifique-se de ter acesso de grava??o na pasta de sincroniza??o.</translation>
+ <location filename="../src/libsync/syncengine.cpp" line="412"/>
+ <source>Could not update virtual file metadata: %1</source>
+ <translation>N?o foi poss?vel atualizar os metadados do arquivo virtual: %1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="419"/>
+ <source>Could not update file metadata: %1</source>
+ <translation>N?o foi poss?vel atualizar os metadados do arquivo: %1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="433"/>
+ <source>Could not set file record to local DB: %1</source>
+ <translation>N?o foi poss?vel definir o registro do arquivo para o BD local: %1</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
@@ -5301,16 +5427,6 @@
<source>Cannot open the sync journal</source>
<translation>N?o ? poss?vel abrir o log de dados de sincroniza??o</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>O espa?o em disco ? pequeno: Os downloads que reduziriam o espa?o livre abaixo de %1 foram ignorados.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>N?o h? espa?o dispon?vel no servidor para alguns uploads.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5318,10 +5434,10 @@
<location filename="../src/gui/tray/syncstatussummary.cpp" line="126"/>
<location filename="../src/gui/tray/syncstatussummary.cpp" line="343"/>
<source>Offline</source>
- <translation>Desligado</translation>
+ <translation>Off-line</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>Voc? precisa aceitar os termos de servi?o</translation>
</message>
@@ -5375,7 +5491,7 @@
<message>
<location filename="../src/gui/tray/syncstatussummary.cpp" line="234"/>
<source>%1 of %2 ? %3 left</source>
- <translation>%1 de %2 ? %3 faltando</translation>
+ <translation>%1 de %2 ? %3 restantes</translation>
</message>
<message>
<location filename="../src/gui/tray/syncstatussummary.cpp" line="238"/>
@@ -5453,7 +5569,7 @@
<message>
<location filename="../src/gui/wizard/termsofservicecheckwidget.cpp" line="140"/>
<source>Polling</source>
- <translation>Consultando</translation>
+ <translation>Sondando</translation>
</message>
<message>
<location filename="../src/gui/wizard/termsofservicecheckwidget.cpp" line="146"/>
@@ -5477,7 +5593,7 @@
<location filename="../src/libsync/theme.cpp" line="419"/>
<source>%1 Desktop Client Version %2 (%3)</source>
<comment>%1 is application name. %2 is the human version string. %3 is the operating system name.</comment>
- <translation>%1 Vers?o do Cliente para Desktop %2 (%3)</translation>
+ <translation>Vers?o do Cliente %1 para Desktop %2 (%3)</translation>
</message>
<message>
<location filename="../src/libsync/theme.cpp" line="611"/>
@@ -5487,7 +5603,7 @@
<message>
<location filename="../src/libsync/theme.cpp" line="629"/>
<source><p>This release was supplied by %1.</p></source>
- <translation><p>This release was supplied by %1.</p></translation>
+ <translation><p>Esta vers?o foi fornecida por %1.</p></translation>
</message>
</context>
<context>
@@ -5505,7 +5621,7 @@
<message>
<location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="450"/>
<source>Search has failed for '%2'.</source>
- <translation>A pesquisa por '%2' falhou.</translation>
+ <translation>A pesquisa falhou para '%2'.</translation>
</message>
<message>
<location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="479"/>
@@ -5549,17 +5665,17 @@
<message>
<location filename="../src/libsync/updatee2eefolderusersmetadatajob.cpp" line="90"/>
<source>Could not fetch public key for user %1</source>
- <translation>N?o foi poss?vel obter a chave p?blica do utilizador %1</translation>
+ <translation>N?o foi poss?vel obter a chave p?blica do usu?rio %1</translation>
</message>
<message>
<location filename="../src/libsync/updatee2eefolderusersmetadatajob.cpp" line="97"/>
<source>Could not find root encrypted folder for folder %1</source>
- <translation>N?o foi poss?vel encontrar a pasta raiz encriptada para a pasta %1</translation>
+ <translation>N?o foi poss?vel encontrar a pasta raiz criptografada para a pasta %1</translation>
</message>
<message>
<location filename="../src/libsync/updatee2eefolderusersmetadatajob.cpp" line="118"/>
<source>Could not add or remove user %1 to access folder %2</source>
- <translation>N?o foi poss?vel adicionar ou remover o utilizador %1 para acessar ? pasta %2</translation>
+ <translation>N?o foi poss?vel adicionar ou remover o usu?rio %1 para acessar ? pasta %2</translation>
</message>
<message>
<location filename="../src/libsync/updatee2eefolderusersmetadatajob.cpp" line="238"/>
@@ -5577,7 +5693,7 @@
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="105"/>
<source>Trigger the migration</source>
- <translation>Acione a migra??o</translation>
+ <translation>Acionar a migra??o</translation>
</message>
<message numerus="yes">
<location filename="../src/gui/tray/usermodel.cpp" line="176"/>
@@ -5603,12 +5719,12 @@
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1082"/>
<source>Open Nextcloud Assistant in browser</source>
- <translation>Abra o Assistente Nextcloud no navegador</translation>
+ <translation>Abrir Nextcloud Assistente no navegador</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1082"/>
<source>Open Nextcloud Talk in browser</source>
- <translation>Abra o Nextcloud Talk no navegador</translation>
+ <translation>Abrir Nextcloud Talk no navegador</translation>
</message>
</context>
<context>
@@ -5644,7 +5760,7 @@
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="159"/>
<source>Could not fetch status. Make sure you are connected to the server.</source>
- <translation>N?o foi poss?vel verificar o status. Verifique se voc? est? conectado ao servidor.</translation>
+ <translation>N?o foi poss?vel obter o status. Verifique se voc? est? conectado ao servidor.</translation>
</message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="163"/>
@@ -5705,11 +5821,6 @@
<source>Less than a minute</source>
<translation>Menos de um minuto</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5717,20 +5828,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1 minuto</numerusform><numerusform>%1 minutos</numerusform><numerusform>%1 minutos</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1 hora</numerusform><numerusform>%1 horas</numerusform><numerusform>%1 horas</numerusform></translation>
@@ -5745,6 +5846,21 @@
<source>%1 days</source>
<translation><numerusform>%1 dia</numerusform><numerusform>%1 dias</numerusform><numerusform>%1 dias</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation><numerusform>%n minuto</numerusform><numerusform>%n minutos</numerusform><numerusform>%n minutos</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform><numerusform>%n horas</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n dia</numerusform><numerusform>%n dias</numerusform><numerusform>%n dias</numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5779,7 +5895,7 @@
<message>
<location filename="../src/gui/vfsdownloaderrordialog.ui" line="39"/>
<source>could not be downloaded</source>
- <translation>n?o foi poss?vel baixar</translation>
+ <translation>n?o p?de ser baixado</translation>
</message>
<message>
<location filename="../src/gui/vfsdownloaderrordialog.ui" line="61"/>
@@ -5794,7 +5910,7 @@
<message>
<location filename="../src/gui/vfsdownloaderrordialog.cpp" line="26"/>
<source>Error downloading %1</source>
- <translation>Erro ao baixando %1</translation>
+ <translation>Erro ao baixar %1</translation>
</message>
<message>
<location filename="../src/gui/vfsdownloaderrordialog.cpp" line="27"/>
@@ -5808,7 +5924,7 @@
<location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="80"/>
<location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="91"/>
<source>Error updating metadata due to invalid modification time</source>
- <translation>Erro ao atualizar os metadados devido a erro na data/hora modificada</translation>
+ <translation>Erro ao atualizar os metadados devido a uma marca temporal de modifica??o inv?lida</translation>
</message>
</context>
<context>
@@ -5817,7 +5933,7 @@
<location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="75"/>
<location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="86"/>
<source>Error updating metadata due to invalid modification time</source>
- <translation>Erro ao atualizar os metadados devido a erro na data/hora modificada</translation>
+ <translation>Erro ao atualizar os metadados devido a uma marca temporal de modifica??o inv?lida</translation>
</message>
</context>
<context>
@@ -5846,7 +5962,7 @@
<message>
<location filename="../src/gui/wizard/welcomepage.ui" line="20"/>
<source>Form</source>
- <translation>Forma</translation>
+ <translation>Formul?rio</translation>
</message>
<message>
<location filename="../src/gui/wizard/welcomepage.ui" line="143"/>
@@ -5856,7 +5972,7 @@
<message>
<location filename="../src/gui/wizard/welcomepage.ui" line="156"/>
<source>Sign up with provider</source>
- <translation>Conecte-se com um provedor</translation>
+ <translation>Registre-se com um provedor</translation>
</message>
<message>
<location filename="../src/gui/wizard/welcomepage.cpp" line="68"/>
@@ -5887,6 +6003,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Favor conectar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>N?o h? pastas de sincroniza??o configuradas.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Desconectado de %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Vers?o do Servidor N?o Suportada</translation>
@@ -5894,7 +6025,7 @@
<message>
<location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
- <translation>O servidor na conta %1 executa uma vers?o n?o suportada %2. Usar este cliente com vers?es de servidor n?o suportadas n?o foi testado e ? potencialmente perigoso. Prossiga por sua conta e risco. </translation>
+ <translation>O servidor na conta %1 executa uma vers?o %2 sem suporte. O uso deste cliente com vers?es de servidor sem suporte n?o foi testado e pode ser perigoso. Prossiga por sua pr?pria conta e risco.</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="284"/>
@@ -5904,32 +6035,7 @@
<message>
<location filename="../src/gui/owncloudgui.cpp" line="285"/>
<source>Your account %1 requires you to accept the terms of service of your server. You will be redirected to %2 to acknowledge that you have read it and agrees with it.</source>
- <translation>Sua conta %1 exige que voc? aceite os termos de servi?o do seu servidor. Voc? ser? redirecionado para %2 para reconhecer que leu e concorda com ele.</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Desconectado de %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Desconectado de contas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Conta %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Favor conectar</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>A sincroniza??o de conta est? desativada</translation>
+ <translation>Sua conta %1 exige que voc? aceite os termos de servi?o do seu servidor. Voc? ser? redirecionado para %2 para reconhecer que leu e concorda com eles.</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
@@ -5953,11 +6059,6 @@
<translation>macOS VFS para %1: foi encontrado um problema.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>N?o h? pastas de sincroniza??o configuradas.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Verificando altera??es na pasta remota "%1"</translation>
@@ -5968,6 +6069,21 @@
<translation>Verificando altera??es na pasta local "%1"</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Desconectado de contas:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Conta %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>A sincroniza??o de conta est? desativada</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5976,11 +6092,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>Pasta &Local</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Nome de Usu?rio</translation>
@@ -6008,28 +6119,17 @@
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="304"/>
<source>Synchronize everything from server</source>
- <translation>Sincronizar tudo a partir do servidor</translation>
+ <translation>Sincronizar tudo do servidor</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="360"/>
<source>Ask before syncing folders larger than</source>
- <translation>Pergunte antes de sincronizar pastas maiores do que</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
+ <translation>Perguntar antes de sincronizar pastas com mais de</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
- <translation>Pergunte antes de sincronizar armazenamentos externos</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Escolha o que quer sincronizar</translation>
+ <translation>Perguntar antes de sincronizar armazenamentos externos</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
@@ -6046,6 +6146,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Apagar a pasta local e iniciar uma sincroniza??o limpa</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Escolher o que sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>Pasta &Local</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6066,12 +6182,12 @@
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="356"/>
<source>TextLabel</source>
- <translation>R?tulo de Texto</translation>
+ <translation>Texto do R?tulo</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="73"/>
<source>Logo</source>
- <translation>Logo</translation>
+ <translation>Logotipo</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="183"/>
@@ -6086,6 +6202,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>no futuro</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1m</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>agora</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Algum tempo atr?s</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6126,57 +6287,12 @@
<source>Synced %1</source>
<translation>%1 sincronizado</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>no futuro</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>agora</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1m</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Algum tempo atr?s</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation>Erro ao excluir o arquivo</translation>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>Caminhos que come?am com o caractere '#' n?o s?o suportados no modo VFS.</translation>
@@ -6198,7 +6314,7 @@
<message>
<location filename="../src/gui/ResolveConflictsDialog.qml" line="64"/>
<source>Choose if you want to keep the local version, server version, or both. If you choose both, the local file will have a number added to its name.</source>
- <translation>Escolha se deseja manter a vers?o local, a vers?o do servidor ou ambas. Se voc? escolher ambos, o arquivo local ter? um n?mero adicionado ao seu nome.</translation>
+ <translation>Escolha se voc? deseja manter a vers?o local, a vers?o do servidor ou ambas. Se voc? escolher ambas, o arquivo local ter? um n?mero adicionado ao seu nome.</translation>
</message>
<message>
<location filename="../src/gui/ResolveConflictsDialog.qml" line="80"/>
@@ -6244,7 +6360,7 @@
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="291"/>
<source>Share label</source>
- <translation>Compartilhar etiqueta</translation>
+ <translation>R?tulo do compartilhamento</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="323"/>
@@ -6255,22 +6371,22 @@
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="356"/>
<source>View only</source>
- <translation>Somente ver</translation>
+ <translation>Somente visualiza??o</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="382"/>
<source>File drop (upload only)</source>
- <translation>Descarte de arquivo (somente enviar)</translation>
+ <translation>Dep?sito de arquivos (somente upload)</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="402"/>
<source>Allow resharing</source>
- <translation>Permitir recompartilhar</translation>
+ <translation>Permitir recompartilhamento</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="441"/>
<source>Hide download</source>
- <translation>Ocultar enviar</translation>
+ <translation>Ocultar download</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="468"/>
@@ -6280,7 +6396,7 @@
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="578"/>
<source>Set expiration date</source>
- <translation>Definir data de validade</translation>
+ <translation>Definir data de expira??o</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="663"/>
@@ -6323,7 +6439,7 @@
<message>
<location filename="../src/gui/filedetails/ShareView.qml" line="121"/>
<source>Share password</source>
- <translation>Compartilhar senha</translation>
+ <translation>Senha do compartilhamento</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareView.qml" line="157"/>
@@ -6338,7 +6454,7 @@
<message>
<location filename="../src/gui/filedetails/ShareView.qml" line="313"/>
<source>Sharing is disabled</source>
- <translation>O compartilhamento est? desativado</translation>
+ <translation>Compartilhamento est? desativado</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareView.qml" line="320"/>
@@ -6348,7 +6464,7 @@
<message>
<location filename="../src/gui/filedetails/ShareView.qml" line="328"/>
<source>Sharing is disabled.</source>
- <translation>O compartilhamento est? desativado.</translation>
+ <translation>Compartilhamento est? desativado.</translation>
</message>
</context>
<context>
@@ -6422,6 +6538,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>Abrir pastas locais ou de grupo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Abrir pasta local</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Conectado</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>Desconectado</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>Abrir pasta local "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>Abrir pasta de grupo "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>Abrir %1 no explorador de arquivos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>Menu de pastas de grupos de usu?rios e pastas locais</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6444,7 +6603,7 @@
<message>
<location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="40"/>
<source>Search files, messages, events ?</source>
- <translation>Pesquise arquivos, mensagens, eventos ... </translation>
+ <translation>Pesquise arquivos, mensagens, eventos ?</translation>
</message>
</context>
<context>
@@ -6460,7 +6619,7 @@
<message>
<location filename="../src/gui/tray/UnifiedSearchResultFetchMoreTrigger.qml" line="45"/>
<source>Load more results</source>
- <translation>Carregar mais resultados </translation>
+ <translation>Carregar mais resultados</translation>
</message>
</context>
<context>
@@ -6468,7 +6627,7 @@
<message>
<location filename="../src/gui/tray/UnifiedSearchResultItemSkeleton.qml" line="29"/>
<source>Search result skeleton.</source>
- <translation>Esqueleto do resultado da pesquisa. </translation>
+ <translation>Esqueleto de resultados de pesquisa.</translation>
</message>
</context>
<context>
@@ -6505,7 +6664,7 @@
<message>
<location filename="../src/gui/tray/UserLine.qml" line="70"/>
<source>Current account status is online</source>
- <translation>O status da conta atual ? online</translation>
+ <translation>O status atual da conta ? on-line</translation>
</message>
<message>
<location filename="../src/gui/tray/UserLine.qml" line="70"/>
@@ -6545,12 +6704,12 @@
<message>
<location filename="../src/gui/UserStatusSelector.qml" line="41"/>
<source>Online status</source>
- <translation>Status online</translation>
+ <translation>Status on-line</translation>
</message>
<message>
<location filename="../src/gui/UserStatusSelector.qml" line="61"/>
<source>Online</source>
- <translation>Online</translation>
+ <translation>On-line</translation>
</message>
<message>
<location filename="../src/gui/UserStatusSelector.qml" line="72"/>
@@ -6611,16 +6770,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6635,6 +6784,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6699,7 +6858,7 @@
<message>
<location filename="../src/gui/main.cpp" line="51"/>
<source>%1 requires on a working system tray. If you are running XFCE, please follow <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">these instructions</a>. Otherwise, please install a system tray application such as "trayer" and try again.</source>
- <translation>%1 requer uma ?rea de notifica??o em funcionamento. Se voc? estiver executando o XFCE, siga <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">estas instru??es</a>. Caso contr?rio, instale um aplicativo de ?rea de notifica??o, como o "trayer" e tente novamente.</translation>
+ <translation>%1 requer uma ?rea de notifica??o em funcionamento. Se voc? estiver executando o XFCE, siga <a href="http://docs.xfce.org/xfce/xfce4-panel/systray">estas instru??es</a>. Caso contr?rio, instale um aplicativo de ?rea de notifica??o, como o "trayer", e tente novamente.</translation>
</message>
</context>
<context>
@@ -6740,7 +6899,7 @@
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Server version downloaded, copied changed local file into case conflict conflict file</source>
- <translation>Vers?o do servidor baixada, copiada arquivo local alterado para arquivo de conflito de caso</translation>
+ <translation>Vers?o do servidor baixada, arquivo local alterado foi copiado para arquivo de conflito de letras mai?sculas e min?sculas</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="47"/>
@@ -6868,16 +7027,16 @@
<translation>Ocorreu um erro durante a configura??o</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Preparando para sincronizar</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>Parando a sincroniza??o</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Preparando para sincronizar</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Sincroniza??o pausada</translation>
@@ -6918,7 +7077,7 @@
<message>
<location filename="../src/gui/guiutility.cpp" line="89"/>
<source>Some available online only</source>
- <translation>Alguns dispon?veis apenas online </translation>
+ <translation>Alguns dispon?veis apenas on-line</translation>
</message>
<message>
<location filename="../src/gui/guiutility.cpp" line="92"/>
@@ -6928,12 +7087,25 @@
<message>
<location filename="../src/gui/guiutility.cpp" line="99"/>
<source>Make always available locally</source>
- <translation>Sempre dispon?vel localmente </translation>
+ <translation>Disponibilizar sempre localmente</translation>
</message>
<message>
<location filename="../src/gui/guiutility.cpp" line="104"/>
<source>Free up local space</source>
- <translation>Libere espa?o local </translation>
+ <translation>Libere espa?o local</translation>
+ </message>
+</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>Ativar sincroniza??o r?pida</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>A sincroniza??o r?pida sincronizar? apenas as altera??es em arquivos e pastas dentro de pastas que foram exploradas. Isto pode aumentar significativamente a capacidade de resposta na configura??o inicial de arquivos virtuais. No entanto, isso causar? downloads redundantes de arquivos movidos para uma pasta inexplorada.</translation>
</message>
</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_pt.ts nextcloud-desktop-3.16.6/translations/client_pt.ts
--- nextcloud-desktop-3.16.4/translations/client_pt.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_pt.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
@@ -570,7 +562,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>N?o foi poss?vel importar contas da configura??o de cliente legacy.</translation>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Espa?o de armazenamento:...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>As pastas n?o selecionadas ser?o <b>removidas</b> do seu sistema de ficheiros local e j? n?o ser?o sincronizadas para este computador</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Cancelar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Aplicar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Ligado ao <server> como <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Sincronizar todos</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Aplicar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Espa?o de armazenamento:...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Cancelar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Ligado ao <server> como <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Nenhuma conta configurada.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>Criptografia Ponta a Ponta com Arquivos Virtuais </translation>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Nenhuma conta configurada.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation type="unfinished"/>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -730,12 +738,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Abrir pasta</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Encriptar</translation>
@@ -774,16 +776,6 @@
<translation>Retomar sincroniza??o</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Retomar sincroniza??o</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Pausar sincroniza??o</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Remover liga??o de sincroniza??o de pasta</translation>
@@ -809,21 +801,11 @@
<translation>N?o foi poss?vel criar a pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar Remo??o da Liga??o de Sincroniza??o de Pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Deseja mesmo parar a sincroniza??o da pasta <i>%1</i>?</p><p><b>Nota:</b> isto <b>n?o</b> ir? eliminar qualquer ficheiro.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Remover Liga??o da Sincroniza??o de Pasta</translation>
@@ -853,23 +835,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -883,36 +865,46 @@
<translation>A opera??o de sincroniza??o est? em execu??o.<br/>Deseja termin?-la?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) de %2 em utiliza??o. Algumas pastas, incluindo a rede montada ou as pastas partilhadas, podem ter limites diferentes.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 em utiliza??o</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 de %2 em utiliza??o</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Atualmente n?o est? dispon?vel nenhuma informa??o da utiliza??o do armazenamento.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 em utiliza??o</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Esta conta suporta encripta??o ponto-a-ponto</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
<source>Connected to %1.</source>
<translation>Ligado a %1.</translation>
@@ -928,80 +920,126 @@
<translation>O Servidor %1 encontra-se em manuten??o</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Terminou a sess?o de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>A ligar a %1 ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Existem pastas que n?o foram sincronizadas por serem demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Existem pastas que n?o foram sincronizadas por serem armazenamento externo:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Existem pastas que n?o foram sincronizadas por serem demasiado grandes ou armazenamento externo:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Abrir pasta</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Retomar sincroniza??o</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Pausar sincroniza??o</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Deseja mesmo parar a sincroniza??o da pasta <i>%1</i>?</p><p><b>Nota:</b> isto <b>n?o</b> ir? eliminar qualquer ficheiro.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>%1 sem liga??o configurada.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Existem pastas que n?o foram sincronizadas por serem demasiado grandes:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) de %2 em utiliza??o. Algumas pastas, incluindo a rede montada ou as pastas partilhadas, podem ter limites diferentes.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Existem pastas que n?o foram sincronizadas por serem armazenamento externo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 de %2 em utiliza??o</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Existem pastas que n?o foram sincronizadas por serem demasiado grandes ou armazenamento externo:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Atualmente n?o est? dispon?vel nenhuma informa??o da utiliza??o do armazenamento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Esta conta suporta encripta??o ponto-a-ponto</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>A ligar a %1 ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>%1 sem liga??o configurada.</translation>
+ </message>
</context>
<context>
<name>OCC::AccountSetupFromCommandLineJob</name>
@@ -1115,11 +1153,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation type="unfinished"/>
@@ -1130,6 +1163,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Selecionar um certificado</translation>
@@ -1180,46 +1218,46 @@
<translation>Continuar</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Erro a aceder ao ficheiro de configura??o</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation type="unfinished"/>
</message>
@@ -1261,6 +1299,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1268,6 +1345,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
@@ -1472,7 +1554,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Erro ao gravar os metadados para a base de dados</translation>
</message>
@@ -1602,21 +1684,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Confirmar elimina??o</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1630,30 +1697,30 @@
%1</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Erro de autentica??o: o nome de utilizador ou a palavra-passe est?o errados.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Confirmar elimina??o</translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
+ <message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>As credenciais fornecidas n?o est?o corretas</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>O servidor configurado para este cliente ? muito antigo</translation>
@@ -1663,16 +1730,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Por favor, atualize para a ultima vers?o do servidor e reinicie o cliente.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Erro de autentica??o: o nome de utilizador ou a palavra-passe est?o errados.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>As credenciais fornecidas n?o est?o corretas</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation type="unfinished"/>
</message>
@@ -1680,19 +1762,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1700,27 +1782,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1959,11 +2041,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
@@ -1975,28 +2052,33 @@
<translation>Erro devolvido pelo servidor: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>N?o foi poss?vel processar a resposta JSON retornada pelo servidor: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>A resposta do servidor n?o contem todos os campos esperados</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>N?o foi poss?vel processar a resposta JSON retornada pelo servidor: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2039,6 +2121,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 foi removido.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 foi atualizado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 foi renomeado para %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 foi movido para %2</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2054,17 +2164,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>'%1' e %n outro(s) ficheiro(s) foram removidos</numerusform><numerusform>'%1' e %n outros ficheiros foram removidos.</numerusform><numerusform>'%1' e %n outros ficheiros foram removidos.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 foi removido.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -2080,33 +2179,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 e %n outro ficheiro foram atualizados.</numerusform><numerusform>%1 e %n outros ficheiros foram atualizados.</numerusform><numerusform>%1 e %n outros ficheiros foram atualizados.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 foi atualizado.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 foi renomeado para %2 e %n outro ficheiro foi renomeado.</numerusform><numerusform>%1 foi renomeado para %2 e %n outros ficheiros foram renomeados.</numerusform><numerusform>%1 foi renomeado para %2 e %n outros ficheiros foram renomeados.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 foi renomeado para %2</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 foi movido para %2 e %n outro ficheiro foi movido.</numerusform><numerusform>%1 foi movido para %2 e %n outros ficheiros foram movidos.</numerusform><numerusform>%1 foi movido para %2 e %n outros ficheiros foram movidos.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 foi movido para %2</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2143,67 +2225,67 @@
<translation>Atividade de Sincroniza??o</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>N?o foi poss?vel ler o ficheiro excluir do sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Foi adicionada uma nova pasta maior que %1 MB: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Foi adicionada uma pasta vinda de armazenamento externo.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Por favor, v? ?s defini??es para a selecionar, se desejar transferi-la.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>A pasta% 1 foi criada, mas foi exclu?da da sincroniza??o anteriormente. Os dados dentro dela n?o ser?o sincronizados.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>A pasta% 1 foi criada, mas foi exclu?da da sincroniza??o anteriormente. N?o ser? sincronizada.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2212,41 +2294,41 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2287,11 +2369,6 @@
<translation>N?o foi poss?vel reiniciar o estado da pasta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(c?pia de seguran?a)</translation>
@@ -2302,6 +2379,11 @@
<translation>(c?pia de seguran?a %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation type="unfinished"/>
@@ -2372,16 +2454,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>A sincroniza??o est? pausada.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (A sincroniza??o est? pausada)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2428,6 +2500,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>A sincroniza??o est? pausada.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (A sincroniza??o est? pausada)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2471,16 +2553,6 @@
<translation>Erro durante o carregamento da lista de pastas a partir do servidor.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>H? conflitos por resolver. Clique para detalhes.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation type="unfinished"/>
@@ -2522,16 +2594,31 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>Transferir %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>H? conflitos por resolver. Clique para detalhes.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>Transferir %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2578,21 +2665,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 de %2, ficheiro %3 de %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2752,11 +2834,6 @@
<translation>Configura??o Geral</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Iniciar no Arranque do Sistema</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation type="unfinished"/>
@@ -2767,11 +2844,6 @@
<translation>Para a Bandeja do Sistema</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Utilizar ?cones &Monocrom?ticos</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2787,17 +2859,32 @@
<translation>Avan?ada</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Pedir confirma??o antes de sincronizar armazenamentos externos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Iniciar no Arranque do Sistema</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Utilizar ?cones &Monocrom?ticos</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2808,11 +2895,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Pedir confirma??o antes de sincronizar armazenamentos externos</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2864,11 +2946,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Reiniciar e Atualizar</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation type="unfinished"/>
@@ -2889,6 +2966,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Reiniciar e Atualizar</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Notifica??es do Servidor que requerem aten??o.</translation>
@@ -2909,6 +2996,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation type="unfinished"/>
@@ -2983,6 +3075,11 @@
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3145,102 +3242,97 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Renomear ficheiro</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation type="unfinished"/>
</message>
@@ -3361,16 +3453,6 @@
<translation><p>Est? dispon?vel uma nova vers?o do Cliente %1.</p><p><b>%2</b> est? dispon?vel para transfer?ncia. A vers?o instalada ? %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Ignorar desta vez</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Obter atualiza??o</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation type="unfinished"/>
@@ -3395,6 +3477,16 @@
<source>Update manually</source>
<translation>Atualiza??o manual</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Ignorar desta vez</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Obter atualiza??o</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3419,6 +3511,23 @@
<translation>O servidor de proxy requer autentica??o</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Largura de Banda de Transfer?ncia</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Limitar para</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation type="unfinished"/>
@@ -3441,46 +3550,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Largura de Banda de Transfer?ncia</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Sem limite</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Limitar para</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Limitar para 3/4 da largura de banda estimada</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Largura de Banda de Envio</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Limitar automaticamente</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Largura de Banda de Envio</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Nome de anfitri?o do servidor proxy</translation>
@@ -3509,6 +3601,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>N?o foi poss?vel procurar por novas atualiza??es.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation type="unfinished"/>
@@ -3539,11 +3641,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>N?o foi poss?vel procurar por novas atualiza??es.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation type="unfinished"/>
@@ -3554,14 +3651,19 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation>O estado de atualiza??o ? desconhecido: n?o foi poss?vel procurar por novas atualiza??es.</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
- <source>Update status is unknown: Did not check for new updates.</source>
- <translation>O estado de atualiza??o ? desconhecido: n?o foi poss?vel procurar por novas atualiza??es.</translation>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
@@ -3739,11 +3841,6 @@
<translation><font color="green">Ligado com sucesso a %1: %2 - vers?o: %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>URL inv?lido</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>N?o foi poss?vel ligar a %1 em %2:<br/>%3</translation>
@@ -3754,6 +3851,16 @@
<translation>Tempo expirou enquanto tentava ligar a %1 em %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Acesso proibido pelo servidor. Para verificar que tem o acesso adequado, <a href="%1">clique aqui</a> para aceder ao servi?o com o seu navegador.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>URL inv?lido</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation type="unfinished"/>
@@ -3764,11 +3871,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Acesso proibido pelo servidor. Para verificar que tem o acesso adequado, <a href="%1">clique aqui</a> para aceder ao servi?o com o seu navegador.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation type="unfinished"/>
@@ -3974,68 +4076,58 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
+ <source>File names containing the character "%1" are not supported on this file system.</source>
+ <comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
- <source>File names containing the character "%1" are not supported on this file system.</source>
- <comment>%1: the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
+ <source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
+ <source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>Folder name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
+ <source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
+ <source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
- <source>File name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="433"/>
+ <source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
- <source>Folder name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
- <source>File name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="433"/>
- <source>Filename contains trailing spaces.</source>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
@@ -4047,6 +4139,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
@@ -4137,64 +4239,74 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation type="unfinished"/>
</message>
@@ -4202,38 +4314,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4251,12 +4363,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>O ficheiro alterou-se desde a sua descoberta</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4313,6 +4419,12 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>O ficheiro alterou-se desde a sua descoberta</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4330,39 +4442,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>N?o foi possivel eliminar o ficheiro %1, erro: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4375,14 +4487,14 @@
<translation>Nao foi possivel remover %1 devido a conflito local com nome de ficheiro</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4390,49 +4502,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4489,39 +4601,39 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>C?digo HTTP errado devolvido pelo servidor. Esperado 201, mas foi recebido "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Erro ao escrever a meta-informa??o par a base de dados</translation>
</message>
@@ -4529,22 +4641,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>N?o foi poss?vel transferir o ficheiro %1 devido a existir um ficheiro com o mesmo nome, diferenciando apenas as mai?sculas ou min?sculas.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4552,11 +4653,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Ficheiro Removido (iniciar upload) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>O ficheiro local foi alterado durante a sincroniza??o. Vai ser finalizado.</translation>
@@ -4586,6 +4682,22 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Ficheiro Removido (iniciar upload) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4834,6 +4946,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Partilha do menu de contexto</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Partilhei alguma coisa consigo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Op??es de partilha</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Copiar link privado para a ?rea de transfer?ncia</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4866,43 +5004,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Partilha do menu de contexto</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Partilhei alguma coisa consigo</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Op??es de partilha</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Atividade</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Copiar link privado para a ?rea de transfer?ncia</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4918,11 +5030,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Copiar liga??o interna</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -4949,12 +5056,6 @@
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Abrir no navegador</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation type="unfinished"/>
@@ -4984,6 +5085,17 @@
<source>Delete</source>
<translation>Eliminar</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Copiar liga??o interna</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Abrir no navegador</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5085,13 +5197,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Esta liga??o N?O ? segura uma vez que n?o est? encriptada.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Servidor vers?o: %1</translation>
@@ -5111,6 +5216,13 @@
<source>The connection is not secure</source>
<translation>A liga??o n?o ? segura</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Esta liga??o N?O ? segura uma vez que n?o est? encriptada.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5203,6 +5315,32 @@
<translation>%1 (ignorado devido a erro anterior, tentando novamente em %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Apenas %1 est?o dispon?veis, ? preciso um m?nimo de %2 para come?ar</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>N?o foi poss?vel abrir ou criar a base de dados de sincroniza??o local. Verifique se tem acesso de grava??o na pasta de sincroniza??o.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>O espa?o em disco ? baixo: foram ignoradas as transfer?ncias que reduziriam o espa?o abaixo de %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>N?o h? espa?o livre suficiente no servidor para alguns uploads.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Conflito por resolver.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation type="unfinished"/>
@@ -5223,22 +5361,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Conflito por resolver.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Apenas %1 est?o dispon?veis, ? preciso um m?nimo de %2 para come?ar</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>N?o foi poss?vel abrir ou criar a base de dados de sincroniza??o local. Verifique se tem acesso de grava??o na pasta de sincroniza??o.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
@@ -5258,16 +5380,6 @@
<source>Cannot open the sync journal</source>
<translation>Imposs?vel abrir o jornal de sincronismo</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>O espa?o em disco ? baixo: foram ignoradas as transfer?ncias que reduziriam o espa?o abaixo de %1.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>N?o h? espa?o livre suficiente no servidor para alguns uploads.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5278,7 +5390,7 @@
<translation>Offline</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5662,11 +5774,6 @@
<source>Less than a minute</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5674,20 +5781,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5702,6 +5799,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5844,6 +5956,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Por favor inicie a sess?o</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>N?o h? pastas de sincroniza??o configurado.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Desconetado de %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Vers?o de servidor n?o suportada</translation>
@@ -5864,31 +5991,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Desconetado de %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Desconetado das contas:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Conta %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Por favor inicie a sess?o</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>A sincroniza??o de contas est? desativada</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5910,11 +6012,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>N?o h? pastas de sincroniza??o configurado.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation type="unfinished"/>
@@ -5925,6 +6022,21 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Desconetado das contas:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Conta %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>A sincroniza??o de contas est? desativada</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5933,11 +6045,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>Pasta Local</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation type="unfinished"/>
@@ -5973,22 +6080,11 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Escolher o que sincronizar</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation type="unfinished"/>
@@ -6003,6 +6099,22 @@
<source>Erase local folder and start a clean sync</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Escolher o que sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>Pasta Local</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6043,6 +6155,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>no futuro</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>agora</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Algum tempo atr?s</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6083,57 +6240,12 @@
<source>Synced %1</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>no futuro</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>agora</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Algum tempo atr?s</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6379,6 +6491,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6568,16 +6723,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6592,6 +6737,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6825,16 +6980,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>A preparar para sincronizar</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>A preparar para sincronizar</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Sincroniza??o em pausa</translation>
@@ -6893,4 +7048,17 @@
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_ro.ts nextcloud-desktop-3.16.6/translations/client_ro.ts
--- nextcloud-desktop-3.16.4/translations/client_ro.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_ro.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
@@ -570,7 +562,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Spa?iu de stocare: ...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Dosarele neselectate vor fi <b> ?terse </b> de pe systemul dumneavoastr? ?i nu vor mai fi sincronizate cu acest calculator</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Anuleaz?</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Aplic?</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Conectat cu <server>ca <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Sincronizeaz? tot</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Aplic?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Spa?iu de stocare: ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Anuleaz?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Conectat cu <server>ca <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Niciun cont configurat.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation type="unfinished"/>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Niciun cont configurat.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation>Afi?eaz? fraza menmonic?</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation type="unfinished"/>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -731,12 +739,6 @@
<translation>Nu se poate cripta acest dosar deoarece nu exist?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Deschide director</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Encrypt</translation>
@@ -775,16 +777,6 @@
<translation>Reporne?te sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Reia sync</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Pauz? sync</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Elimin? conexiunea de sincronizare pentru acest dosar</translation>
@@ -810,21 +802,11 @@
<translation>Crearea directorului a e?uat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Nu s-a putut creea un dosar local <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirm? eliminarea conexiunii de sincronizare </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Dore?ti s? opre?ti sincronizarea dosarului <i>%1</i>?</p><p><b>Not?:</b> Aceast? func?ie <b>nu</b>va ?terge nici-un fi?ier.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Elimin? conexiunea de sincronizare</translation>
@@ -858,23 +840,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -888,34 +870,44 @@
<translation>Opera?iunea de sincronizare este ?n derulare. <br/>Dore?ti s? o opre?ti ?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) din %2 ?n folosire. Unele fi?iere, inclusiv dosarele partajate prin re?ea, ar putea avea limite diferite.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 folosi?i</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 din %2 utilizat</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>?n acest moment nu exist? informa?ii legate de folosirea spa?iului de stocare.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 folosi?i</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 ca %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>Versiunea serverului %1 este veche ?i nu mai este men?inut!? Continu? pe propriul t?u risc.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Contul permite criptare end-to-end.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -933,80 +925,126 @@
<translation>Serverul %1 este momentan in mentenan??,</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Deautentificat de la %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Se conecteaz? la %1 ...</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Exist? dosare ce nu au fost sincronizate deoarece au o dimenziune prea mare:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Exist? dosare ce nu sunt sincronizate deoarece se afl? pe stocarea extern?:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Eroare de configurare a serverulu: %1 la %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Exist? dosare ce nu au fost sinscronizate deoarece acestea sunt prea mari sau se afl? pe stocarea extern?:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Deschide director</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Reia sync</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Pauz? sync</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Nu s-a putut creea un dosar local <i>%1</i>.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Dore?ti s? opre?ti sincronizarea dosarului <i>%1</i>?</p><p><b>Not?:</b> Aceast? func?ie <b>nu</b>va ?terge nici-un fi?ier.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Nu exist? nici-o conexiune configurat? la %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Exist? dosare ce nu au fost sincronizate deoarece au o dimenziune prea mare:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Exist? dosare ce nu sunt sincronizate deoarece se afl? pe stocarea extern?:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) din %2 ?n folosire. Unele fi?iere, inclusiv dosarele partajate prin re?ea, ar putea avea limite diferite.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Exist? dosare ce nu au fost sinscronizate deoarece acestea sunt prea mari sau se afl? pe stocarea extern?:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 din %2 utilizat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>?n acest moment nu exist? informa?ii legate de folosirea spa?iului de stocare.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 ca %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>Versiunea serverului %1 este veche ?i nu mai este men?inut!? Continu? pe propriul t?u risc.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Se conecteaz? la %1 ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Contul permite criptare end-to-end.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Eroare de configurare a serverulu: %1 la %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Nu exist? nici-o conexiune configurat? la %1.</translation>
+ </message>
</context>
<context>
<name>OCC::AccountSetupFromCommandLineJob</name>
@@ -1120,11 +1158,6 @@
<translation>Certificat & cheie (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Navigheaz? ...</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Parola certificatului:</translation>
@@ -1135,6 +1168,11 @@
<translation>Este recomandat? folosirea unei chei pkcs12 deoarece o copie va fii p?strat? ?n fi?ierul de configurare.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Navigheaz? ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Selecteaz? un certificat</translation>
@@ -1185,46 +1223,46 @@
<translation>Continuare</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 cont</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>1 foldere</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 folder</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Import mostenit</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>A ap?rut o eroare ?n accesarea fi?ierului de ocnfigurare</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation type="unfinished"/>
</message>
@@ -1266,6 +1304,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1273,6 +1350,11 @@
<translation>Fi?ierul %1 nu poate fi ?nc?rcat deoarece exist? un alt fi?ier cu acela?i nume, care difer? doar ?n cazul ?n care, exist?</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Fi?ierul %1 are o or? de modificare invalid?. Nu ?l ?nc?rca?i pe server.</translation>
@@ -1477,7 +1559,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>A ap?rut o eroare ?n timpul scrierii de metadata ?n baza de date</translation>
</message>
@@ -1607,21 +1689,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Dore?ti s? ?tergi dosarul <i>%1</i>?i tot con?inutul permanent ?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Dore?i s? ?tergi fi?ierul <i>%1</i>permanent ? </translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Confirma stergerea</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1637,30 +1704,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Cont Nextcloud neconfigurat</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Dore?ti s? ?tergi dosarul <i>%1</i>?i tot con?inutul permanent ?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Eroare de autentificare: Fie numele de utilizator fie parola sunt gre?ite.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Dore?i s? ?tergi fi?ierul <i>%1</i>permanent ? </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Confirma stergerea</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Timeout</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Informa?iile de autentificare nu sunt corecte</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>Serverul configurat pentru acest client este prea vechi</translation>
@@ -1670,16 +1737,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>V? rug?m s? instala?i ultima versiune a serverului ?i s? reporni?i clientul</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Eroare de autentificare: Fie numele de utilizator fie parola sunt gre?ite.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Cont Nextcloud neconfigurat</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Informa?iile de autentificare nu sunt corecte</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Eroare la anularea ?tergerii unui fi?ier</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation> Eroare la anularea ?tergerii lui %1</translation>
</message>
@@ -1687,19 +1769,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Eroare de server: PROPFIND reply is not XML formatted!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1707,27 +1789,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>A ap?rut o eroare ?n timpul deschiderii dosarului %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Dosarul nu este accesibil pe acest client, accesul este refuzat</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Dosarul nu a fost g?sit: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>Encodarea numelui fisierului nu este valid?</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>A ap?rut o eroare in timpul citirii dosarului %1</translation>
</message>
@@ -1967,11 +2049,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>De?i URL-ul ?ncepe cu HTTPS, adresa URL-ului de pooling nu ?ncepe cu HTTPS. Autentificarea nu va fii posibil? deoarece ar putea exista o problem? de securitate. V? rug?m contacta?i administartorul dumneavoastr?.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>De?i URL-ul ?ncepe cu HTTPS, adresa URL-ului de pooling nu ?ncepe cu HTTPS. Autentificarea nu va fii posibil? deoarece ar putea exista o problem? de securitate. V? rug?m contacta?i administartorul dumneavoastr?.</translation>
@@ -1983,28 +2060,33 @@
<translation>R?spunsul serverului con?ine o eroare: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>De?i URL-ul ?ncepe cu HTTPS, adresa URL-ului de pooling nu ?ncepe cu HTTPS. Autentificarea nu va fii posibil? deoarece ar putea exista o problem? de securitate. V? rug?m contacta?i administartorul dumneavoastr?.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>A ap?rut o eroare in accesarea punctului final 'token': <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Nu sa putut analiza fi?ierul JSON provenit de la server: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>R?spunsul de la server nu con?ine toate informa?iile a?teptate</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Nu sa putut analiza fi?ierul JSON provenit de la server: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2047,6 +2129,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 a fost ?ters.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 a fost ?nc?rcat.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 a fost redenumit ?n %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 a fost mutat ?n %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2062,17 +2172,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 ?i %n alte fi?ier(e) a fost ?ters. </numerusform><numerusform>%1 ?i %n alte fi?ier(e) au fost ?terse. </numerusform><numerusform>Au fost ?terse %1 ?i alte %n fi?ier(e).</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 a fost ?ters.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>A fost ad?ugat %1 ?i alte %n fi?ier(e).</numerusform><numerusform>Au fost ad?ugate %1 ?i alte %n fi?ier(e).</numerusform><numerusform>Au fost ad?ugate %1 ?i alte %n fi?ier(e).</numerusform></translation>
@@ -2088,33 +2187,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 ?i alte %n fi?ier(e) au fost actualizatr.</numerusform><numerusform>%1 ?i alte %n fi?ier(e) au fost actualizate. </numerusform><numerusform>%1 ?i alte %n fi?ier(e) au fost actualizate. </numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 a fost ?nc?rcat.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 a fost redenumit ?n %2 ?i alte %n fi?ier(e) au fost redenumite.</numerusform><numerusform>%1 a fost redenumit ?n %2 ?i alte %n fi?ier(e) au fost redenumite.</numerusform><numerusform>%1 a fost redenumit ?n %2 ?i alte %n fi?ier(e) au fost redenumite.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 a fost redenumit ?n %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 a fost mutat ?n %2 ?i alte %n fi?ier(e) au fost mutate.</numerusform><numerusform>%1 a fost mutat ?n %2 ?i alte %n fi?ier(e) au fost mutate.</numerusform><numerusform>%1 a fost mutat ?n %2 ?i alte %n fi?ier(e) au fost mutate.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 a fost mutat ?n %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2151,67 +2233,67 @@
<translation>Activitate de sincronizare</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Nu sa putut citi fi?ierul de excludere</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Un nou fi?ier mai mare de %1 MB a fost ad?ugat: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Un dosar dintr-o loca?ie extern? de stocare a fost ad?ugat.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>V? rug?m s? selecta?i ?n set?ri dac? dori?i s? desc?rca?i acest fi?ier.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Dosarul %1 a fost creeat dar a fost exclus, ?n trecut de la sincronizare. Con?inutul nu va fii sincronizat.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Fisierul %1 a fost creeat dar a fost exclus, ?n trecut de la sincronizare. Acest nu va fii sincronizat.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2224,41 +2306,41 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2299,11 +2381,6 @@
<translation>Nu s-a putut reseta starea dosarului</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>Un jurnal de sicronizare vechi '%1' a fost g?sit, dar acesta nu a putut fi ?ters. V? rug?m s? v? asigura?i c? acest jurnal nu este folosit de o aplica?ie.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>copie de siguran?? (backup)</translation>
@@ -2314,6 +2391,11 @@
<translation>copia de siguran?? %1 (backup)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>Un jurnal de sicronizare vechi '%1' a fost g?sit, dar acesta nu a putut fi ?ters. V? rug?m s? v? asigura?i c? acest jurnal nu este folosit de o aplica?ie.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation type="unfinished"/>
@@ -2384,16 +2466,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Sincronizarea este oprit?.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (Sincronizarea este oprit?)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2440,6 +2512,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Sincronizarea este oprit?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (Sincronizarea este oprit?)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2483,16 +2565,6 @@
<translation>A ap?rut o eroare ?n momentul desc?rc?rii listei de dosare de pe server.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Se descarc? lista de dosare de pe server ...</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Exist? conflicte nerezolvate. Click pentru mai multe detalii.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>Suportul pentru fi?iere virtuale este pornit.</translation>
@@ -2534,16 +2606,31 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Exist? conflicte nerezolvate. Click pentru mai multe detalii.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation type="unfinished"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Se descarc? lista de dosare de pe server ...</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2590,21 +2677,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 din %2, fi?ier %3 din %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>Se a?teapt? pentru alte %n dosar(e) ...</numerusform><numerusform>Se a?teapt? pentru alte %n dosar(e) ...</numerusform><numerusform>Se a?teapt? pentru alte %n dosar(e) ...</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>Se a?teapt? pentru alte %n dosar(e) ...</numerusform><numerusform>Se a?teapt? pentru alte %n dosar(e) ...</numerusform><numerusform>Se a?teapt? pentru alte %n dosar(e) ...</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2764,11 +2846,6 @@
<translation>Set?ri Generale</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Lanseaz? la pornire</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>Afi?eaz? notific?rile de apeluri</translation>
@@ -2779,11 +2856,6 @@
<translation>Pentru System Tray</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Folose?te pictograme &Monochrome </translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2799,17 +2871,32 @@
<translation>Avansat</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Cere?i o confirmare ?nainte de a sincroniza foldere noi mai mari de</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Solicita?i confirmarea ?nainte de sincronizarea stoc?rilor externe</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Lanseaz? la pornire</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Folose?te pictograme &Monochrome </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Cere?i o confirmare ?nainte de a sincroniza foldere noi mai mari de</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>Notifica?i c?nd folderele sincronizate cresc mai mult dec?t limita specificat?.</translation>
@@ -2820,11 +2907,6 @@
<translation>Dezactiva?i automat sincronizarea folderelor care dep??esc limita.</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Solicita?i confirmarea ?nainte de sincronizarea stoc?rilor externe</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2876,11 +2958,6 @@
<translation>Canal pentru actualiz?ri</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Restart && Actualizare</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>&Verificarea automat? a actualiz?rilor</translation>
@@ -2901,6 +2978,16 @@
<translation>Aviz juridic</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Restart && Actualizare</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Notific?ri ale serverului care necesit? aten?ie.</translation>
@@ -2921,6 +3008,11 @@
<translation>Nu pute?i dezactiva pornirea automat? deoarece pornirea automat? la nivel de sistem este activat?.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>stabil</translation>
@@ -2995,6 +3087,11 @@
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3155,102 +3252,97 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation type="unfinished"/>
</message>
@@ -3371,16 +3463,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>S?ri?i de data aceasta</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Ob?ine actualizare</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation type="unfinished"/>
@@ -3405,6 +3487,16 @@
<source>Update manually</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>S?ri?i de data aceasta</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Ob?ine actualizare</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3429,6 +3521,23 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Viteza de desc?rcare</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Limitat la</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation type="unfinished"/>
@@ -3451,46 +3560,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Viteza de desc?rcare</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>F?r? limit?</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Limitat la</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Limiteaz? la 3/4 din viteza estimat?</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Vitez? ?nc?rcare</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Limiteaz? automat</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Vitez? ?nc?rcare</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation type="unfinished"/>
@@ -3519,6 +3611,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation type="unfinished"/>
@@ -3549,11 +3651,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation type="unfinished"/>
@@ -3564,13 +3661,18 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
- <source>Update status is unknown: Did not check for new updates.</source>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3749,11 +3851,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>URL invalid</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation type="unfinished"/>
@@ -3764,6 +3861,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>URL invalid</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation type="unfinished"/>
@@ -3774,11 +3881,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation type="unfinished"/>
@@ -3984,68 +4086,58 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
+ <source>File names containing the character "%1" are not supported on this file system.</source>
+ <comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
- <source>File names containing the character "%1" are not supported on this file system.</source>
- <comment>%1: the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
+ <source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
+ <source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>Folder name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
+ <source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
+ <source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
- <source>File name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="433"/>
+ <source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
- <source>Folder name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
- <source>File name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="433"/>
- <source>Filename contains trailing spaces.</source>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
@@ -4057,6 +4149,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
@@ -4147,64 +4249,74 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation type="unfinished"/>
</message>
@@ -4212,38 +4324,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4261,12 +4373,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4323,6 +4429,12 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4340,39 +4452,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4385,14 +4497,14 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4400,49 +4512,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4499,39 +4611,39 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
@@ -4539,22 +4651,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4562,11 +4663,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
@@ -4596,6 +4692,22 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4844,6 +4956,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Am partajat ceva cu tine</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4876,43 +5014,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Am partajat ceva cu tine</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4928,11 +5040,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Copiaz? linkul intern</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -4959,12 +5066,6 @@
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Deschide ?n Browser</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation type="unfinished"/>
@@ -4994,6 +5095,17 @@
<source>Delete</source>
<translation>?terge</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Copiaz? linkul intern</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Deschide ?n Browser</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5094,12 +5206,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Versiunea serverului: %1</translation>
@@ -5119,6 +5225,12 @@
<source>The connection is not secure</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5211,23 +5323,24 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="383"/>
- <source>Could not update file: %1</source>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="412"/>
- <source>Could not update virtual file metadata: %1</source>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="419"/>
- <source>Could not update file metadata: %1</source>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="433"/>
- <source>Could not set file record to local DB: %1</source>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -5236,14 +5349,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <location filename="../src/libsync/syncengine.cpp" line="383"/>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="412"/>
+ <source>Could not update virtual file metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="419"/>
+ <source>Could not update file metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="433"/>
+ <source>Could not set file record to local DB: %1</source>
<translation type="unfinished"/>
</message>
<message>
@@ -5266,16 +5388,6 @@
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5286,7 +5398,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5670,11 +5782,6 @@
<source>Less than a minute</source>
<translation>Mai putin de un minut</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5682,20 +5789,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5710,6 +5807,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5852,23 +5964,13 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
- <source>Unsupported Server Version</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="272"/>
- <source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="284"/>
- <source>Terms of service</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="285"/>
- <source>Your account %1 requires you to accept the terms of service of your server. You will be redirected to %2 to acknowledge that you have read it and agrees with it.</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -5877,23 +5979,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Deconectat de la conturile:</translation>
+ <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <source>Unsupported Server Version</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Cont %1: %2</translation>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
+ <source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="284"/>
+ <source>Terms of service</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
+ <location filename="../src/gui/owncloudgui.cpp" line="285"/>
+ <source>Your account %1 requires you to accept the terms of service of your server. You will be redirected to %2 to acknowledge that you have read it and agrees with it.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -5918,11 +6020,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation type="unfinished"/>
@@ -5933,6 +6030,21 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Deconectat de la conturile:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Cont %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"/>
@@ -5941,11 +6053,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation type="unfinished"/>
@@ -5981,22 +6088,11 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation type="unfinished"/>
@@ -6011,6 +6107,22 @@
<source>Erase local folder and start a clean sync</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6051,6 +6163,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>?n viitor</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>acum</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6091,57 +6248,12 @@
<source>Synced %1</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>?n viitor</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>acum</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6387,6 +6499,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6576,16 +6731,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation type="unfinished"/>
@@ -6600,6 +6745,16 @@
<source>%L1 KB</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6833,13 +6988,13 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
+ <location filename="../src/libsync/theme.cpp" line="126"/>
+ <source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="126"/>
- <source>Stopping sync</source>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
<translation type="unfinished"/>
</message>
<message>
@@ -6901,4 +7056,17 @@
<translation>Elibera?i spa?iu local</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_ru.ts nextcloud-desktop-3.16.6/translations/client_ru.ts
--- nextcloud-desktop-3.16.4/translations/client_ru.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_ru.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>???????? ??????? ?????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>??? ????????? ??????? ????????????? ????? ???????????????? ?????? ????? ? ?????, ??????? ???? ??????? ? ??????????, ??? ??????????? ????????? ????? ?? ?????????????? ????????? ?? ?????? ??????. ???????? ????????, ??? ??????? ????????????? ??????????? ????? ????????????? ??????, ???????????? ? ?????, ??????? ?? ???? ??????? ? ??????????.</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>???????????? ??????????? ?????</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -557,7 +549,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>?????? ?? ?????? ??????</translation>
</message>
@@ -572,7 +564,7 @@
<translation>??????????</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>?? ??????? ????????????? ??????? ?????? ?? ???????????? ??????????? ???????.</translation>
</message>
@@ -580,33 +572,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>?????? ?????????:?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>???????????? ????? ????? <b>???????</b> ?? ????????? ???????? ??????? ? ?????? ?? ????? ?????????????????? ?? ???? ??????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>??????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>?????????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>??????????? ?????????? ? <server> ? ??????? ??????? <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>???????????????? ???</translation>
@@ -637,6 +607,33 @@
<translation>????????? ???????????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>?????? ?????????:?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>??????????? ?????????? ? <server> ? ??????? ??????? <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>??????? ?????? ?? ?????????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>????????? ?????????? ??????????? ??????</translation>
@@ -671,9 +668,9 @@
<b>?????? ???????? ???????? ???????????. ???????????</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>??????? ?????? ?? ?????????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -686,6 +683,11 @@
<translation>???????? ????????? ?????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>???????? ?????????? ???? ???????? ??? ???? ??????? ??????</translation>
@@ -711,6 +713,12 @@
<translation>??? ????????????? ????? ????????? ??????. ??????????? ????? ?????? ???????? ????? ?? ???????? ?????????????.</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -734,12 +742,6 @@
<translation>?? ??????? ??????????? ?????, ??? ????? ?? ??????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>??????? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>???????????</translation>
@@ -778,16 +780,6 @@
<translation>????????????? ?????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>??????????? ?????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>????????????? ?????????????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>????????? ????????????? ?????</translation>
@@ -813,21 +805,11 @@
<translation>?????? ???????? ?????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>?? ??????? ??????? ????????? ?????: <i>?%1?</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>????????????? ?????????? ????????????? ?????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>????????????? ?????????? ????????????? ????? <i>%1</i>?</p><p><b>??????????:</b> ??? ???????? <b>??</b> ???????? ? ???????? ??????.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>????????? ????????????? ?????</translation>
@@ -861,24 +843,24 @@
<translation>?????????? ?????????? ??????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>??? ?????? ??????? ?????????????? ????????? ?????????? ?? ??? ????????? ??? ?????? ?????, ????????? ?? 12 ????. ????????? ??? ????? ? ???????? ?????, ??? ????? ??? ??????????? ? ??????? ?????? ????? ?????????????? ????????? (????????, ???????? ??? ???????????? ??).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>?????????? ????????? ??????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>????????? ???????? ?????????? ??? ?%1??</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>??? ?????????? ????????? ?????????? ????? ??????? ????????? ????? ????????????? ??????.<br>? ??????? ????????????? ????? ??????? ?? ?????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -891,34 +873,44 @@
<translation>??????????? ?????????????.<br/>????????????? ???????? ????????? </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>???????????? %1 (%3%) ?? %2. ????????? ?????, ??????? ??????? ??? ?????, ????? ????? ???? ??????????? ???????????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>???????????? %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>???????????? %1 ?? %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>? ?????? ?????? ?????????? ? ????????????? ????????? ??????????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>?????????? %2 ?????, ?????? ??????? ???????? %1 ??</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>???????????? %1</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>??? ???? ??????? ?????? ???????? ?????????? ???? ???????? ?? ?????? ??????????.<br>??? ????? ???????? ?? ???? ??????????, ????? ????????? ?????.<br>??? ???????? ???????????????? ???????????? ????????????? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>?????? ?????? %1 ?? ??????????????. ??????????? ?? ???? ????? ? ????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>????????? ??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>??? ??????? ?????? ???????????? ???????? ??????????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -936,79 +928,125 @@
<translation>?????? %1 ? ????????? ????? ????????? ? ?????? ???????????? ????????????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>?????? %1 ?????????? ??????????????? ??? ??? ??????????? ? ????????? ???????????? ???????? ?????.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>??????? ????? ?? %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>??????????? ? %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>???? ?????, ??????? ?? ????????????????, ??? ??? ?? ?????? ????????? ????????????? ???????????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>?? ??????? ???????????? ? %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>???? ?????, ??????? ?? ???? ????????????????, ??? ??? ??? ???????? ???????? ???????????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>?????? ???????????? ???????: %1: %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>???? ?????, ??????? ?? ???? ????????????????, ??? ??? ?? ?????? ????????? ????????????? ??????????? ??? ??? ???????? ???????? ???????????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>??????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>??? ???????????? ??????????? %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>??????????? ?????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>????????????? ?????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>???? ?????, ??????? ?? ????????????????, ??? ??? ?? ?????? ????????? ????????????? ???????????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>?? ??????? ??????? ????????? ?????: <i>?%1?</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>???? ?????, ??????? ?? ???? ????????????????, ??? ??? ??? ???????? ???????? ???????????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>????????????? ?????????? ????????????? ????? <i>%1</i>?</p><p><b>??????????:</b> ??? ???????? <b>??</b> ???????? ? ???????? ??????.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>???? ?????, ??????? ?? ???? ????????????????, ??? ??? ?? ?????? ????????? ????????????? ??????????? ??? ??? ???????? ???????? ???????????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>??? ?????? ??????? ?????????????? ????????? ?????????? ?? ??? ????????? ??? ?????? ?????, ????????? ?? 12 ????. ????????? ??? ????? ? ???????? ?????, ??? ????? ??? ??????????? ? ??????? ?????? ????? ?????????????? ????????? (????????, ???????? ??? ???????????? ??).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>?????????? %2 ?????, ?????? ??????? ???????? %1 ??</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>?????????? ????????? ??????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>??? ???? ??????? ?????? ???????? ?????????? ???? ???????? ?? ?????? ??????????.<br>??? ????? ???????? ?? ???? ??????????, ????? ????????? ?????.<br>??? ???????? ???????????????? ???????????? ????????????? ?????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>????????? ???????? ?????????? ??? ?%1??</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>??? ??????? ?????? ???????????? ???????? ??????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>??? ?????????? ????????? ?????????? ????? ??????? ????????? ????? ????????????? ??????.<br>? ??????? ????????????? ????? ??????? ?? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>????????? ??????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>???????????? %1 (%3%) ?? %2. ????????? ?????, ??????? ??????? ??? ?????, ????? ????? ???? ??????????? ???????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>???????????? %1 ?? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>? ?????? ?????? ?????????? ? ????????????? ????????? ??????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>?????? ?????? %1 ?? ??????????????. ??????????? ?? ???? ????? ? ????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>?????? %1 ?????????? ??????????????? ??? ??? ??????????? ? ????????? ???????????? ???????? ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>??????????? ? %1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>?? ??????? ???????????? ? %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>?????? ???????????? ???????: %1: %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>??? ???????????? ??????????? %1.</translation>
</message>
</context>
<context>
@@ -1123,11 +1161,6 @@
<translation>?????????? ? ???? (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>????????</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>?????? ???????????:</translation>
@@ -1138,6 +1171,11 @@
<translation>????????????? ???????????? ??????????? ????????? ? ??????? pkcs12, ?.?. ??? ????? ????? ????????? ? ????? ????????????.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>???????? ??????????</translation>
@@ -1188,34 +1226,34 @@
<translation>??????????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>??????? ???????: %1</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>???? ??????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>?????: %1</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>???? ?????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>?????? ?? ?????????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1223,12 +1261,12 @@
%3.</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>?????? ??? ??????? ? ????? ????????????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>?????? ??? ????????? ? ????? ???????????? ?%1?, ?????????, ??? ???? ???????? ??? ????????? ??????? ??????.</translation>
</message>
@@ -1270,6 +1308,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1277,6 +1354,11 @@
<translation>???? %1 ?? ????? ???? ????????, ?????? ??? ?????????? ?????? ???? ? ????? ?? ??????, ???????????? ?????? ?????????</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>???? %1 ????? ???????????? ????? ?????????. ?? ?????????? ??? ?? ??????.</translation>
@@ -1481,7 +1563,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>?????? ?????? ?????????? ? ???? ??????</translation>
</message>
@@ -1611,21 +1693,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>????????????? ??????? ????? <i>%1</i> ? ??? ?? ?????????? ????????? </translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>????????????? ??????? ???? <i>%1</i> ????????? </translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>??????????? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1641,30 +1708,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>??????? ?????? Nextcloud ?? ?????????</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>????????????? ??????? ????? <i>%1</i> ? ??? ?? ?????????? ????????? </translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>?????? ???????????: ??? ???????????? ??? ?????? ?? ?????.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>????????????? ??????? ???? <i>%1</i> ????????? </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>??????????? ????????</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>????-???</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>????????? ??????? ?????? ?? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>??????????? ?????? ??????? ???? ??? ????? ???????</translation>
@@ -1674,16 +1741,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>???????? ?????? ?? ????????? ?????? ? ????????????? ??????.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>?????? ???????????: ??? ???????????? ??? ?????? ?? ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>??????? ?????? Nextcloud ?? ?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>????????? ??????? ?????? ?? ?????</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>?????? ??? ?????? ???????? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>?????? ??? ?????? ???????? %1</translation>
</message>
@@ -1691,19 +1773,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>?????? ???????: ????? PROPFIND ?? ? ??????? XML.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>?????? ????????? ????????????? ??????????!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>?????? ????????? ????????????? ??????????: ?????????????? ??????? ? ??????? ?????.</translation>
</message>
@@ -1711,27 +1793,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>?? ??????? ??????? ??????? ?%1?</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>??????? ?? ???????? ??? ???????, ?????? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>??????? ?%1? ?? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>???????????? ????????? ????? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>?? ??????? ????????? ?????????? ???????? ?%1?</translation>
</message>
@@ -1971,11 +2053,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>??? ??????? ????????? ??????????? ? ?????????????? HTTPS ??????? ????? ??? ????????????? HTTPS. ??????????? ????????? ??????????? ????? ????????, ??? ??? ????? ???? ???????????. ???????? ? ???????? ?????????? ??????????????.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>??? ??????? ????????? ??????????? ? ?????????????? HTTPS ??????? ????? ???????, ?? ????????????? HTTPS. ??????????? ????????? ??????????? ????? ????????, ??? ??? ????? ???? ???????????. ???????? ? ???????? ?????????? ??????????????.</translation>
@@ -1987,28 +2064,33 @@
<translation>?????? ??????? ?? ??????: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>??? ??????? ????????? ??????????? ? ?????????????? HTTPS ??????? ????? ??? ????????????? HTTPS. ??????????? ????????? ??????????? ????? ????????, ??? ??? ????? ???? ???????????. ???????? ? ???????? ?????????? ??????????????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>?????? ??? ??????? ? ????????? ????????? ???????: <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>?? ??????? ????????? ????? ??????? ? ??????? JSON: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>? ?????? ??????? ?????????? ?? ??? ????????? ????</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>?? ??????? ????????? ????? ??????? ? ??????? JSON: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2051,6 +2133,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>?%1? ??????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>?%1? ????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>?%1? ???????????? ? ?%2?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>?%1? ????????? ? ?%2?.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2066,17 +2176,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>??????? ?%1? ? ??? %n ????.</numerusform><numerusform>??????? ?%1? ? ??? %n ?????.</numerusform><numerusform>??????? ?%1? ? ??? %n ??????.</numerusform><numerusform>??????? ?%1? ? ??? %n ??????.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>?%1? ??????.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 ? ??? %n ???? ?????????.</numerusform><numerusform>%1 ? ??? %n ????? ?????????.</numerusform><numerusform>%1 ? ??? %n ?????? ?????????.</numerusform><numerusform>%1 ? ??? %n ????? ?????????.</numerusform></translation>
@@ -2092,33 +2191,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>????????? ?%1? ? ??? ???? ????.</numerusform><numerusform>????????? ?%1? ? ??? %n ?????.</numerusform><numerusform>????????? ?%1? ? ??? %n ??????.</numerusform><numerusform>????????? ?%1? ? ??? %n ?????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>?%1? ????????.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>?%1? ???????????? ? ?%2?, ??? ???????????? ???? ????.</numerusform><numerusform>?%1? ???????????? ? ?%2?, ??? ????????????? %n ?????.</numerusform><numerusform>?%1? ???????????? ? ?%2?, ??? ????????????? %n ??????.</numerusform><numerusform>?%1? ???????????? ? ?%2?, ??? ????????????? %n ??????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>?%1? ???????????? ? ?%2?.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 ??? ????????? ? %2, ? ??? %n ?????? ???? ??? ?????????.</numerusform><numerusform>%1 ??? ????????? ? %2, ? ??? %n ?????? ????? ???? ??????????.</numerusform><numerusform>%1 ??? ????????? ? %2, ? ??? %n ?????? ????? ???? ??????????.</numerusform><numerusform>%1 ??? ????????? ? %2, ? ??? %n ?????? ????? ???? ??????????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>?%1? ????????? ? ?%2?.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2155,68 +2237,68 @@
<translation>?????? ?????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>?? ??????? ????????? ???? ?????????? ?????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>????????? ????? ????? ?%2?, ?????? ??????? ????????? %1 ??.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>???? ????????? ????? ?? ???????? ?????????.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>????? ??????? ????? ?????, ????????? ? ????????? ?????????? ? ???????? ?? ??? ?????????????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>?????? ????? ???????? ???????? ??????????? ? %1 ??: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>?????????? ????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>????????? ?????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>?????? ????? ?%1? ???????? ???????? ??????????? ? %2 ??.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>????????? ????????????? ???? ??????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>??????? ????? ?%1? ???????, ?? ????? ??? ???? ????????? ?? ?????????????. ?????? ?????? ???? ????? ?? ????? ????????????????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>?????? ???? ?%1?, ?? ????? ?? ??? ???????? ?? ?????????????. ???? ???? ?? ????? ???????????????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2228,12 +2310,12 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>?????? ???????? ???????????? ????? ? ????? "%1", ???????? "%2" ? ?????????? ?? ?????? "%3"</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2242,29 +2324,29 @@
? ???????? ???????????? ?? ?????? ???????????? ??? ????????? ?????, ???????? ?? ?? ????? '%1' ?? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation>???? ??????? ??????? ?????????? ?????? ?? ????? ????????? ????? "%1". ??????????, ???????????, ???? ?????? ?????????? ????????. ? ???????? ???????????? ?? ?????? ???????????? ??? ????????? ?????, ???????? ?? ? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>??????? ??? ??????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>?????????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>???????????? ????? ?? ??????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>???????????? ????? ? ???????</translation>
</message>
@@ -2305,11 +2387,6 @@
<translation>?????????? ???????? ????????? ?????</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>?????? ?????? ?????? ????????????? ?%1?, ?? ?? ?? ????? ???? ??????. ?????????, ??? ???? ??????? ?? ?????? ? ?????? ??????????.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(????????? ?????)</translation>
@@ -2320,6 +2397,11 @@
<translation>(????????? ????? %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>?????? ?????? ?????? ????????????? ?%1?, ?? ?? ?? ????? ???? ??????. ?????????, ??? ???? ??????? ?? ?????? ? ?????? ??????????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>?????????????? ?????????.</translation>
@@ -2390,16 +2472,6 @@
<translation>?????? ????????????? ??? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>????????????? ??????????????.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (????????????? ??????????????)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2446,6 +2518,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>????????????? ??????????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (????????????? ??????????????)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2489,16 +2571,6 @@
<translation>?????? ???????? ?????? ????? ? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>????????? ? ??????? ?????? ??????</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>??????? ????????????? ?????????, ??????? ??? ????????? ????????? ????????.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>????????? ??????????? ?????? ????????.</translation>
@@ -2540,16 +2612,31 @@
<translation>%1 %2 ...</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>??????? %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>???? %1 ?? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>??????? ????????????? ?????????, ??????? ??? ????????? ????????? ????????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>??????? %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>????????? ? ??????? ?????? ??????</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2596,21 +2683,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 ?? %2, %3 ?? %4 ??????(?)</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>???? %1 ?? %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>???????? %n ??????</numerusform><numerusform>???????? %n ??????</numerusform><numerusform>???????? %n ??????</numerusform><numerusform>???????? %n ??????</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>???-??? ???????? ?????????????</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>???????? %n ??????</numerusform><numerusform>???????? %n ??????</numerusform><numerusform>???????? %n ??????</numerusform><numerusform>???????? %n ??????</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2770,11 +2852,6 @@
<translation>???????? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&????????? ??? ????? ? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>?????????? ??????????? ? ???????</translation>
@@ -2785,11 +2862,6 @@
<translation>?????-????? ?????? ? ????????? ?????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>???????????? ??&???-????? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>?????????? ??????????? ?? ?????</translation>
@@ -2805,17 +2877,32 @@
<translation>?????????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>??????????? ????????????? ????????????? ????? ???????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>??</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>??????????? ????????????? ????????????? ??????? ????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&????????? ??? ????? ? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>???????????? ??&???-????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>??????????? ????????????? ????????????? ????? ???????? ?????</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>?????????? ? ?????????? ????????? ????????????? ??????? ?????</translation>
@@ -2826,11 +2913,6 @@
<translation>????????????? ????????? ????????????? ?????, ?????? ??????? ???????? ???????? ?????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>??????????? ????????????? ????????????? ??????? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>?????????? ????????? ????? ? ???????</translation>
@@ -2882,11 +2964,6 @@
<translation>????? ??????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&?????????? ? ??????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>????????? ??????? ?&?????????</translation>
@@ -2907,6 +2984,16 @@
<translation>??????????? ???????????</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&?????????? ? ??????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>????????? ???????? ???????????, ?????????? ? ???????.</translation>
@@ -2927,6 +3014,11 @@
<translation>?????????????? ?????? ?? ????? ???? ????????, ?.?. ?? ???????? ?? ?????? ???????.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>??????????</translation>
@@ -3008,6 +3100,11 @@
<source>Debug archive is created at %1</source>
<translation>????? ? ??????????? ??????? ??????: ?%1?</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3171,102 +3268,97 @@
<translation>????? ??? ?????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>???????????? ????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>???? ?%1? ?? ????? ???? ???????????????, ??? ??? ??? ??? ???????? ???????, ???????????????? ???????????? ????????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>???????????? ??????? ?? ???????????? ????????? ???????: * " | & ? , ; : \ / ~ < > ? ??????? ??????? ? ?????? ? ????? ?????.</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>???? "%1" ?? ????? ???? ???????????????, ??? ??? ??? ??? ???????? ???????, ???????????? ?? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>????????? ??????? ???????????: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>????????? ??????? ????? ???????????: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>????????? ????? ?????? ???????????: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>????????? ?????????? ?????? ???????????: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>??????????? ???????? ???? ??????? ??? ???????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>? ??? ??? ?????????? ?? ?????????????? ????? ?????. ????????? ?????? ????? ????????????? ???.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>?? ??????? ???????? ??????????: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>??? ????? ???????? ??????? ? ?????? ??? ?? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>??? ????? ???????? ??????? ? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>??? ????? ???????? ??????? ?? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>???????????? ???????????? ???</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>??? ????? ???????? ???????????? ???????: % 1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>?? ??????? ????????????? ????. ?????????, ??? ?? ?????????? ? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>?????????? ????????????? ????, ????????? ???? ? ????? ?????? ??? ?????????? ?? ???????. ??????????, ???????? ?????? ???.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>?? ??????? ????????????? ????????? ????: %1</translation>
</message>
@@ -3390,16 +3482,6 @@
<translation><p>???????? ????? ?????? ?????????? %1.</p><p><b>%2</b> ???????? ??? ????????. ????????????? ??????: %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>?????????? ? ???? ???</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>???????? ??????????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>???? ??????????</translation>
@@ -3424,6 +3506,16 @@
<source>Update manually</source>
<translation>???????? ???????</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>?????????? ? ???? ???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>???????? ??????????</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3448,6 +3540,23 @@
<translation>??????-?????? ??????? ???????????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>???????? ???????? ? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>?????????? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>?????/???</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>????????: ????????? ?????? ?? ??????????? ??? ??????? ???????, ??? ????? ??????? localhost</translation>
@@ -3470,46 +3579,29 @@
<translation>???????????? ?????????? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>???????? ???????? ? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>??? ???????????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>?????/???</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>?????????? ??</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>?????????? ?? 3/4 ?????????????? ?????? ??????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>???????? ???????? ?? ??????</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>???????????? ?????????????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>???????? ???????? ?? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>????? ??????-???????</translation>
@@ -3538,6 +3630,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>?? ??????? ????????? ??????? ????? ??????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>???????? ??????? ?????????? ?? ???????...</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>???????? ?????????? %1</translation>
@@ -3568,11 +3670,6 @@
<translation>?? ??????? ????????? ??????????. ???????? %1, ????? ????????? ?????????? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>?? ??????? ????????? ??????? ????? ??????????.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>???????? ????? % 1. ???????? <a href='%2'>%2</a>, ????? ????????? ??????????.</translation>
@@ -3583,16 +3680,21 @@
<translation>???????? ????? %1. ??????????, ???????? %2, ????? ????????? ??????????.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>???????? ??????? ?????????? ?? ???????...</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>?????? ?????????? ??????????: ?? ??????? ????????? ??????? ??????????.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>?????????? ? ????????? ?????? ???. ? ??? ??????????? ????? ????????? ?????? ??????????.</translation>
@@ -3768,11 +3870,6 @@
<translation><font color="green">???????? ??????????? ? %1: %2 ?????? %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>???????? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>?? ??????? ???????????? ? %1 ? %2:<br/>%3</translation>
@@ -3783,6 +3880,16 @@
<translation>????????? ????? ???????? ?????????? ? %1 ?? %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>?????? ???????? ????????. ????? ????????, ??? ? ??? ???? ????? ???????, <a href="%1">??????? ?????</a> ??? ????? ????? ??? ???????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>???????? ??????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>??????? ??????????? ? ??????? %1 ?? ?????? %2...</translation>
@@ -3793,11 +3900,6 @@
<translation>?????? ??????????? ? ??????? ????????????? ?? ?%1?. ?????? ???????, ?????? ??????????? ????????.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>?????? ???????? ????????. ????? ????????, ??? ? ??? ???? ????? ???????, <a href="%1">??????? ?????</a> ??? ????? ????? ??? ???????.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>??????? ???????? ????? ?? ?????????????? ?????? WebDAV</translation>
@@ -4009,62 +4111,34 @@
<translation>???????????? ???????? ??????? ?? ???????????? ????? ??????, ?????????????? ?? ?????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>?????</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>????</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>%1 ???????? ? ????? ?????? ?%2?, ??????? ?? ?????????????? ???????????? ???????? ????????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>%1 ???????? ??? ??????? ???? ??????????? ??????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>%1 ?????????? ???, ???????? ? ???????????? ???????? ??????? ????????? ????????????????? ??????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>??? ????? ???????? ?? ??????? ???? ???? ???????????? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4074,6 +4148,24 @@
<translation>??? ????? ???????? ??????? ?? ?????.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>?????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>%1 ???????? ? ????? ?????? ?%2?, ??????? ?? ?????????????? ???????????? ???????? ????????.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4082,6 +4174,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>%1 ???????? ??? ??????? ???? ??????????? ??????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>%1 ?????????? ???, ???????? ? ???????????? ???????? ??????? ????????? ????????????????? ??????.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>??? ????? ???????? ??????? ? ??????.</translation>
@@ -4172,64 +4274,74 @@
<translation>?????? ??????? ?? ?????????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>????????????? ?????????? ?? ??????? ????????????? ??????? ????????? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>?? ??????? ????????? ????, ?.?. ?? ?????? ? "%1".</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>?? ??????? ??????? ?? ???? ?????? ?????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>?????????? ? ???????????? ????????????, ??????????? ??????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>???????????? ??-?? ?????????? ? ??????? ? ?????? ?????????? ?? ?????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>???????????? ???? ??? ???????? ????????? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>???????????? ???? ??? ???????? ?????? ? ???? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>???????? ????? ????? ?? ?????? ?? ?????????, ?.?. ?? ???????? ?????? ??? ??????, ??????????? ??????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>???????? ???????????, ??????????? ??????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>?????? ?????? ???? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>?????? ??????? ??? ??????? ????????? ??????? ?%1?: %2</translation>
</message>
@@ -4237,38 +4349,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>?? ??????? ??????? ???? %1 ?? ????????? ???? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>?????? ?????????? ?????????? ??-?? ????????????? ??????? ???????????</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>????? %1 ?? ????? ???? ?????? ??? ??????: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>??????????? ??????????</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>?????? ?????????? ??????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>???? ????????????</translation>
</message>
@@ -4286,12 +4398,6 @@
<translation>???? %1 ?? ????? ???? ???????? ??-?? ?????????? ?????????? ? ??????????? ??????????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>????? ??????????? ???? ??? ???????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4348,6 +4454,12 @@
<source>The file %1 is currently in use</source>
<translation>???? ?%1? ????????????</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>????? ??????????? ???? ??? ???????</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4365,39 +4477,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>?? ??????? ??????? ???? ?%1?, ??????: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>??????? ?%1? ?? ????? ???? ?????? ?? ??????? ????????? ???? ????????? ?????? ??? ?????????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>?? ??????? ??????? ????? ?%1?</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>????? %1 ?? ????? ???? ?????? ??? ??????: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>??????????? ??????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>?????? ?????????? ??????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>???? ?%1? ????????????</translation>
</message>
@@ -4410,14 +4522,14 @@
<translation>?? ??????? ??????? ?%1? ??-?? ?????????? ????????? ????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>?? ??????? ??????? ?????? ? ????? %1 ?? ????????? ???? ??????</translation>
</message>
@@ -4425,49 +4537,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>????? ?%1? ?? ????? ???? ?????????????, ??? ??? ??? ???????? ???????? ? ????????? ???? ????????? ?????? ??? ?????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>???? ?%1? ????????, ?? ??? ??????? ? ????????? ???? ????????? ??????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>?? ??????? ???????? ???? %1 ?? ????????? ???? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>?? ??????? ?????? ????????? pin</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>?????? ?????????? ??????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>???? ?%1? ????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>?? ??????? ?????????????? ?????????????? ???????? ? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>?? ??????? ????????????? ????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>?? ??????? ??????? ?????? ? ????? %1 ?? ????????? ???? ??????</translation>
</message>
@@ -4524,39 +4636,39 @@
<translation>?? ??????? ????????????? ?%1? ? ?%2?, ????????? ?? ??????: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>?????? ?????????? ??????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>???? ?%1? ????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>?????? ??????? ???????????? ????? HTTP. ???????? 201, ?? ??????? ?%1 %2?.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>?? ??????? ???????? ???? %1 ?? ????????? ???? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>?? ??????? ??????? ?????? ? ????? %1 ?? ????????? ???? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>?? ??????? ?????? ????????? pin</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>?????? ?????? ?????????? ? ???? ??????</translation>
</message>
@@ -4564,22 +4676,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>?? ??????? ???????? ?? ?????? ????????????? ????.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>?????????? ????????? ???? ?%1?, ??? ??? ??? ?????????? ???? ? ??? ?? ??????, ?? ???????????? ????????? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>??? ???????? ?%1? ?? ?????? ????? ????????? ?????, ????????????? ??? ?????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4587,11 +4688,6 @@
<translation>???? %1 ????? ???????????? ????? ???????????. ?? ?????????? ??? ?? ??????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>???? ?????? (?????? ????????) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>????????? ???? ????????? ? ???????? ?????????????. ???????? ????? ????????????.</translation>
@@ -4621,6 +4717,22 @@
<source>The file %1 is currently in use</source>
<translation>???? ?%1? ????????????</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>??? ???????? ?%1? ?? ?????? ????? ????????? ?????, ????????????? ??? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>?? ??????? ???????? ?? ?????? ????????????? ????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>???? ?????? (?????? ????????) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4869,6 +4981,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>??????????? ???? ?????????????? ?????? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>? ????????? ? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>????? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>????????? ???????? ?????? ?? ??????????? ?????...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>??????????? ???????? ?????? ? ????? ??????</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>?? ??????? ??????????? ??????? ? "% 1"</translation>
@@ -4903,43 +5041,17 @@
<translation>????????? ????? ???? ??????? ???????????: "%1"</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>??????????? ???? ?????????????? ?????? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>??????? ????? ???????????? ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>? ????????? ? ?????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>????? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>??????????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>??????????? ???????? ?????? ? ????? ??????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>????????? ???????? ?????? ?? ??????????? ?????...</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>?????????? ?? ??????????? ??????? ? ????? ???????</translation>
@@ -4955,11 +5067,6 @@
<translation>????????? ?????????? ???? ????? ?? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>??????????? ?????????? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>???????????</translation>
@@ -4986,12 +5093,6 @@
<translation><numerusform>?????????? ????? ????? ????? %1 ??????</numerusform><numerusform>?????????? ????? ????? ????? %1 ??????</numerusform><numerusform>?????????? ????? ????? ????? %1 ?????</numerusform><numerusform>?????????? ????? ????? ????? %1 ??????</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>??????? ? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>?????????? ????????? ?</translation>
@@ -5021,6 +5122,17 @@
<source>Delete</source>
<translation>???????</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>??????????? ?????????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>??????? ? ????????</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5122,13 +5234,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>??? ?????????? ?? ?????????, ???????????? ???????? ??? ??????????.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>?????? ???????: %1</translation>
@@ -5148,6 +5253,13 @@
<source>The connection is not secure</source>
<translation>?????????? ???????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>??? ?????????? ?? ?????????, ???????????? ???????? ??? ??????????.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5240,6 +5352,32 @@
<translation>%1 (????????? ??-?? ?????????? ??????, ????????? ??????? ????? %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>?????? %1 ????????, ????? ??? ??????? %2 ????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>?? ???? ??????? ??? ??????? ????????? ???? ?????? ?????????????. ??????????????, ??? ? ??? ???? ?????? ?? ?????? ? ??????? ?????????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>???? ????? ?? ?????: ??????????, ??????? ???????? ????????? ????? ???? %1, ????? ?????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>?? ??????? ???????????? ????? ??? ????????? ???????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>????????????? ????????.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>?? ??????? ???????? ????: %1</translation>
@@ -5260,22 +5398,6 @@
<translation>?? ??????? ????????? ?????? ? ????? %1 ? ????????? ???? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>????????????? ????????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>?????? %1 ????????, ????? ??? ??????? %2 ????? ??????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>?? ???? ??????? ??? ??????? ????????? ???? ?????? ?????????????. ??????????????, ??? ? ??? ???? ?????? ?? ?????? ? ??????? ?????????????.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>??? ??????????? ?????? ????????? ????????????? ???????????? ????????, ?? ??????? ?? ??????</translation>
@@ -5295,16 +5417,6 @@
<source>Cannot open the sync journal</source>
<translation>?? ??????? ??????? ?????? ?????????????</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>???? ????? ?? ?????: ??????????, ??????? ???????? ????????? ????? ???? %1, ????? ?????????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>?? ??????? ???????????? ????? ??? ????????? ???????.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5315,7 +5427,7 @@
<translation>?? ? ????</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5699,11 +5811,6 @@
<source>Less than a minute</source>
<translation>?????? ??????</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5711,20 +5818,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5739,6 +5836,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5881,6 +5993,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>??????? ? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>????????????? ????? ?? ?????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>???????? ?? %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>?????? ??????? ?? ??????????????</translation>
@@ -5901,31 +6028,6 @@
<translation>???? ??????? ?????? %1 ???????, ????? ?? ??????? ??????? ?????????????? ????? ?????? ???????. ?? ?????? ?????????????? ?? ???????? %2 ??? ???????????? ? ????????????? ???????? ? ????.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>???????? ?? %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>???????? ?? ??????? ???????:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>??????? ?????? %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>??????? ? ???????</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>????????????? ??????? ?????? ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5947,11 +6049,6 @@
<translation>macOS VFS ??? %1: ???????? ????????.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>????????????? ????? ?? ?????????.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>???????? ????????? ?? ??????? ?%1?</translation>
@@ -5962,6 +6059,21 @@
<translation>???????? ????????? ? ????????? ????? ?%1?</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>???????? ?? ??????? ???????:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>??????? ?????? %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>????????????? ??????? ?????? ?????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5970,11 +6082,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&????????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>??? ????????????</translation>
@@ -6010,22 +6117,11 @@
<translation>?????????? ????? ?????????????? ????? ???????? ?????</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>??</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>?????????? ????? ?????????????? ??????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>???????? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>????????? ????????? ??????</translation>
@@ -6040,6 +6136,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>??????? ????????? ????? ? ????????? ?????? ????????????? ??????</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>???????? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&????????? ?????</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6080,6 +6192,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%n ?.</numerusform><numerusform>%n ?.</numerusform><numerusform>%n ?.</numerusform><numerusform>%n ?.</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>? ???????</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%n ?.</numerusform><numerusform>%n ?.</numerusform><numerusform>%n ?.</numerusform><numerusform>%n ?.</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1 ?.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%n ?.</numerusform><numerusform>%n ?.</numerusform><numerusform>%n ?.</numerusform><numerusform>%n ?.</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>?????? ???</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>????????? ????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6120,57 +6277,12 @@
<source>Synced %1</source>
<translation>???? ?%1? ???????????????</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%n ?.</numerusform><numerusform>%n ?.</numerusform><numerusform>%n ?.</numerusform><numerusform>%n ?.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>? ???????</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%n ?.</numerusform><numerusform>%n ?.</numerusform><numerusform>%n ?.</numerusform><numerusform>%n ?.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>?????? ???</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1 ?.</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%n ?.</numerusform><numerusform>%n ?.</numerusform><numerusform>%n ?.</numerusform><numerusform>%n ?.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>????????? ????? ?????</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>??? ????????????? ??????????? ???????? ??????? ?????? ???????????? ????, ???????????? ? ??????? ?#?.</translation>
@@ -6416,6 +6528,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>??????? ????????? ??? ????????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>??????? ????????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>??????? ????????? ????? "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>??????? ????????? ????? "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>??????? %1 ? ???????????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>???? ???????????? ????????? ? ????????? ?????</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6605,16 +6760,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 ?</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 ??</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 ??</translation>
@@ -6629,6 +6774,16 @@
<source>%L1 KB</source>
<translation>%L1 ??</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 ?</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 ??</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6862,16 +7017,16 @@
<translation>????????? ?????? ?? ????? ?????????</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>?????????? ? ?????????????</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>????????? ?????????????</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>?????????? ? ?????????????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>????????????? ??????????????</translation>
@@ -6930,4 +7085,17 @@
<translation>?????????? ????? ?? ????????? ?????</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>???????? ??????? ?????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>??? ????????? ??????? ????????????? ????? ???????????????? ?????? ????? ? ?????, ??????? ???? ??????? ? ??????????, ??? ??????????? ????????? ????? ?? ?????????????? ????????? ?? ?????? ??????. ???????? ????????, ??? ??????? ????????????? ??????????? ????? ????????????? ??????, ???????????? ? ?????, ??????? ?? ???? ??????? ? ??????????.</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_sc.ts nextcloud-desktop-3.16.6/translations/client_sc.ts
--- nextcloud-desktop-3.16.4/translations/client_sc.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_sc.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
@@ -570,7 +562,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Logu de archiviatzione: ...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Is cartellas non controlladas ant a ?ssere <b>bogadas</b> dae s'arch?viu de sistema e no ant a ?ssere prus sincronizadas cun custu elaboradore</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Annulla</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>?plica</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Conn?tidu a <server> comente <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Sincroniza totu</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>?plica</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Logu de archiviatzione: ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Annulla</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Conn?tidu a <server> comente <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Perunu contu cunfiguradu.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation type="unfinished"/>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Perunu contu cunfiguradu.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation>Visualiza mnem?nicu</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation type="unfinished"/>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -731,12 +739,6 @@
<translation>No at fatu a tzifrare sa cartella, ca no esistit prus</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Aberi cartella</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Tzifra</translation>
@@ -775,16 +777,6 @@
<translation>Torra a cumintzare sa sincronizatzione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Ripr?stina sincronizatzione</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Firma sa sincronizatzione</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Boga sa connessione pro sincronizare is cartellas</translation>
@@ -810,21 +802,11 @@
<translation>Creatzione cartella faddida</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>No at fatu a creare una cartella locale <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Cunfirma bogadura connessione de sincronizatzione cartellas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>A beru boles firmare sa sincronizatzione de is cartellas <i>%1</i>?</p><p><b>Mira:</b> custa operatzione <b>no</b> at a cantzellare perunu arch?viu.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Boga connessione de sincronizatzione cartellas</translation>
@@ -858,23 +840,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -888,34 +870,44 @@
<translation>Sa sincronizatzione est in esecutzione.<br/> cheres a dda terminare?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) de %2 impreadu. Calicuna cartella, incluende cuddas montadas in sa rete o cuddas cumpartzidas, diant ?ere barrancos diferentes.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 impreados</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 de %2 impreados</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Immoe non ddoe at informatziones a disponimentu subra de s'impreu de s'isp?tziu de archiviatzione.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 impreados</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 comente %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>Sa versione %1 de su serbidore non est suportada! Sighi a arriscu tuo.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Custu contu non disponet de sa tzifradura end-to-end</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -933,80 +925,126 @@
<translation>Su serbidore %1 pro immoe en in modalidade de mantenidura.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Disconn?tidu dae %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Connetende?si a %1 ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Ddoe at cartellas chi non sunt istadas sincronizadas ca sunt tropu mannas:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Ddoe at cartellas chi non sunt istadas sincronizadas ca in foras ddoe at mem?rias de archiviatzione:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Ddoe at ?pidu un'errore in su serbidore: %1 in %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Ddoe at cartellas chi non sunt istadas sincronizadas ca sunt tropu mannas o mem?rias de archiviatziones de foras:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Aberi cartella</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Ripr?stina sincronizatzione</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Firma sa sincronizatzione</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>No at fatu a creare una cartella locale <i>%1</i>.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>A beru boles firmare sa sincronizatzione de is cartellas <i>%1</i>?</p><p><b>Mira:</b> custa operatzione <b>no</b> at a cantzellare perunu arch?viu.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Perunu connessione %1 configurada.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Ddoe at cartellas chi non sunt istadas sincronizadas ca sunt tropu mannas:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Ddoe at cartellas chi non sunt istadas sincronizadas ca in foras ddoe at mem?rias de archiviatzione:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) de %2 impreadu. Calicuna cartella, incluende cuddas montadas in sa rete o cuddas cumpartzidas, diant ?ere barrancos diferentes.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Ddoe at cartellas chi non sunt istadas sincronizadas ca sunt tropu mannas o mem?rias de archiviatziones de foras:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 de %2 impreados</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Immoe non ddoe at informatziones a disponimentu subra de s'impreu de s'isp?tziu de archiviatzione.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 comente %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>Sa versione %1 de su serbidore non est suportada! Sighi a arriscu tuo.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Connetende?si a %1 ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Custu contu non disponet de sa tzifradura end-to-end</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Ddoe at ?pidu un'errore in su serbidore: %1 in %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Perunu connessione %1 configurada.</translation>
+ </message>
</context>
<context>
<name>OCC::AccountSetupFromCommandLineJob</name>
@@ -1120,11 +1158,6 @@
<translation>Certificadu & Crae (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Naviga ?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Crae de su tzertificadu:</translation>
@@ -1135,6 +1168,11 @@
<translation>Si cuns?giat bivamente unu pachete pkcs12 tzifradu dae chi una c?pia at a ?ssere archiviada in is arch?vios de cunfiguratzione.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Naviga ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Seletziona unu tzertificadu</translation>
@@ -1185,46 +1223,46 @@
<translation>Sighi</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Ddoe at ?pidu un'errore intrende a s'arch?viu de cunfiguratzione</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation type="unfinished"/>
</message>
@@ -1266,6 +1304,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1273,6 +1350,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
@@ -1477,7 +1559,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>DDoe at ?pidu un'errore iscriende metadatos in sa base de datos</translation>
</message>
@@ -1607,21 +1689,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Boles cantzellare sa cartella <i>%1</i> e totu is contenutos de su totu?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Boles cantzellare s'arch?viu <i>%1</i> de su totu?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Cunfirma cantzelladura</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1637,30 +1704,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Perunu contu de Nextcloud cunfiguradu</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Boles cantzellare sa cartella <i>%1</i> e totu is contenutos de su totu?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Errore de autenticatzione: su n?mene utente o sa crae sunt isballiados.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Boles cantzellare s'arch?viu <i>%1</i> de su totu?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Cunfirma cantzelladura</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Agabbadu su tempus</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Is credentziales frunidas non sunt curretas</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>Su serbidore cunfiguradu pro su cliente est tropu b?ciu</translation>
@@ -1670,16 +1737,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Pro praghere agiorna su serbidore a sa versione noa e torra a aviare su cliente.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Errore de autenticatzione: su n?mene utente o sa crae sunt isballiados.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Perunu contu de Nextcloud cunfiguradu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Is credentziales frunidas non sunt curretas</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation type="unfinished"/>
</message>
@@ -1687,19 +1769,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Errore de su serbidore: sa risposta PROPFIND no est in formadu XML!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1707,27 +1789,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Ddoe at ?pidu un'errore aberende sa cartella %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Non faghet a intrare a sa cartella in su cliente, permissu negadu</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Cartella no agatada: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>Sa cod?fica de su n?mene de s'arch?viu no est v?lida</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Ddoe at ?pidu un'errore leghende sa cartella %1</translation>
</message>
@@ -1967,11 +2049,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>S'URL de cumproa no cumintzat cun HTTPS comente s'URL de atzessu. No s'at a p?dere f?ghere s'atzessu ca bi podent ?ssere problemas de seguresa. Cuntata s'amministratzione.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>S'URL de serbidore de resposta no cumintzat cun HTTPS comente s'URL de atzessu. No s'at a p?dere f?ghere s'atzessu ca bi podent ?ssere problemas de seguresa. Cuntata s'amministratzione.</translation>
@@ -1983,28 +2060,33 @@
<translation>Errore torradu dae su serbidore: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>S'URL de cumproa no cumintzat cun HTTPS comente s'URL de atzessu. No s'at a p?dere f?ghere s'atzessu ca bi podent ?ssere problemas de seguresa. Cuntata s'amministratzione.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Ddoe at ?pidu un'errore intrende a su terminadore de is "token": <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>No at fatu a elaborare su JSON torradu dae su serbidore: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>Sa risposta de su serbidore non teniat totu is campos isetados</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>No at fatu a elaborare su JSON torradu dae su serbidore: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2047,6 +2129,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 nch'est istadu bogadu.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 est istadu agiornadu.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 est istadu torradu a numenare comente %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 nch'est istadu tramudadu a %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2062,17 +2172,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 e %n ?teros arch?vios nche sunt bogados.</numerusform><numerusform>%1 e %n ?teros arch?vios nche sunt bogados.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 nch'est istadu bogadu.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 e %n ?teros arch?vios nche sunt istados agiuntos.</numerusform><numerusform>%1 e %n ?teros arch?vios nche sunt istados agiuntos.</numerusform></translation>
@@ -2088,33 +2187,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 e %n ?teros arch?vios sunt istados agiornados.</numerusform><numerusform>%1 e %n ?teros arch?vios sunt istados agiornados.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 est istadu agiornadu.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 est istadu torradu a numenare comente %2 e %n ?teros arch?vios sunt istados torrados a numenare.</numerusform><numerusform>%1 ? stato rinominato in %2 e %n altri file sono stati rinominati.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 est istadu torradu a numenare comente %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 est istadu tramudadu a %2 e %n ?teros arch?vios sunt istados tramudados.</numerusform><numerusform>%1 est istadu tramudadu a %2 e %n ?teros arch?vios sunt istados tramudados.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 nch'est istadu tramudadu a %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2151,67 +2233,67 @@
<translation>Atividade de sincronizatzione</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>No at fatu a l?ghere s'arch?viu de esclusione de su sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Una cartella noa prus manna de %1 MB est istada agiunta: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Una cartella noa est istada agiunta dae una mem?ria de dae un'archiviatzione de foras.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Bae a sa cunfiguratzione pro dda seletzionare si dda boles iscarrigare.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Sa cartella %1 est istada creada, ma in antis est istada lassada in foras de sa sincronizatzione, Is datos in intro no ant a ?ssere sincronizados.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>S'arch?viu %1 est istadu creadu, ma in antis est istadu lassadu in foras de sa sincronizatzione. No at a ?ssere sincronizadu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2224,41 +2306,41 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2299,11 +2381,6 @@
<translation>No at fatu a ripristinare s'istadu de sa cartella</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>Agatadu unu registru betzu de archiviatzione "%1" ma non faghet a ddu bogare. Assegura?ti chi peruna aplicatzione siat impreende?ddu.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation> (c?pia de seguresa)</translation>
@@ -2314,6 +2391,11 @@
<translation> (c?pia de seguresa %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>Agatadu unu registru betzu de archiviatzione "%1" ma non faghet a ddu bogare. Assegura?ti chi peruna aplicatzione siat impreende?ddu.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation type="unfinished"/>
@@ -2384,16 +2466,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Sa sincronizatzione est in p?usa.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (Sincronizatzione in p?usa)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2440,6 +2512,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Sa sincronizatzione est in p?usa.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (Sincronizatzione in p?usa)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2483,16 +2565,6 @@
<translation>Ddoe ?t ?pidu un'errore carrighende sa lista de is cartellas dae su serbidore.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Rec?beru de s'elencu de cartellas dae su serbidore ...</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Ddoe at cunflitos ancora a is?rvere. Incarca pro is det?llios.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>Sa ghia de is arch?vios virtuales est ativadu.</translation>
@@ -2534,16 +2606,31 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Ddoe at cunflitos ancora a is?rvere. Incarca pro is det?llios.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation type="unfinished"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Rec?beru de s'elencu de cartellas dae su serbidore ...</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2590,21 +2677,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 de %2, arch?viu %3 de %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>Isetende %n ?teras cartella(s) ?</numerusform><numerusform>Abetende %n ?teras cartella(s) ?</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>Isetende %n ?teras cartella(s) ?</numerusform><numerusform>Abetende %n ?teras cartella(s) ?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2764,11 +2846,6 @@
<translation>Cunfiguratzione generale</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>es&cuta a s'aviu de su sistema</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation type="unfinished"/>
@@ -2779,11 +2856,6 @@
<translation>Pro sa safata de sistema</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Imprea Iconas &monocrom?ticas</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2799,17 +2871,32 @@
<translation>Avantzadu</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Pedi cunfirma in antis de sincronizare mem?rias foranas</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>es&cuta a s'aviu de su sistema</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Imprea Iconas &monocrom?ticas</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2820,11 +2907,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Pedi cunfirma in antis de sincronizare mem?rias foranas</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2876,11 +2958,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Torra a aviare && agiorna</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation type="unfinished"/>
@@ -2901,6 +2978,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Torra a aviare && agiorna</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Serbidore de not?ficas chi tocat a ddis dare contu.</translation>
@@ -2921,6 +3008,11 @@
<translation>Non faghet a disativare s'aviamentu autom?ticu ca est ativu s'aviamentu autom?ticu a livellu de sistema.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>st?bile</translation>
@@ -2995,6 +3087,11 @@
<source>Debug archive is created at %1</source>
<translation>S'arch?viu de debug nch'est creadu in %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3159,102 +3256,97 @@
<translation>N?mene nou de s'arch?viu</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Torra a numenare s'arch?viu</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>No tenes su permissu de torrare a numenare custu arch?viu. Pedi a chie at creadu s'arch?viu de ddu torrare a numenare.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>Su n?mene de s'arch?viu cuntenet car?teres no am?tidos: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>No at fatu a torrare a numenare s'arch?viu. Controlla si tenes connessione a su serbidore.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>No at fatu a torrare a numenare s'arch?viu, ca in su serbidore nd'at giai un'?teru cun su matessi n?mene. S?bera un'?teru n?mene.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation type="unfinished"/>
</message>
@@ -3378,16 +3470,6 @@
<translation><p>Una versione noa de su cliente %1 Client est a disponimentu.</p><p><b>%2</b> est dispostu pro ddu isc?rrigare. Sa versione installada est %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Brinca custa borta</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Ot?ne s'agiornamentu</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>Agiornamentu faddidu</translation>
@@ -3412,6 +3494,16 @@
<source>Update manually</source>
<translation>Agiorna tue etotu</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Brinca custa borta</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Ot?ne s'agiornamentu</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3436,6 +3528,23 @@
<translation>Serbidore interm?diu pedit de s'identificare</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Mann?ria de banda de intrada</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>L?mita a</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>Avisu: sa cunfiguratzione de su serbidore interm?diu non tenet nissunu efetu pro is contos de s'acollidore locale</translation>
@@ -3458,46 +3567,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Mann?ria de banda de intrada</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Perunu l?mite</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>L?mita a</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>L?mita a su tres bator de sa banda istimada</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Carriga?nche sa banda de intrada</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>L?mita in autom?ticu</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Carriga?nche sa banda de intrada</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>N?mene de s'acollidore de su serbidore interm?diu</translation>
@@ -3526,6 +3618,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>No at fatu a controllare is agiornamentos noos.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Controllu serbidore de is agiornamentos ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation> Un'agionamentu nou de %1 est prontu</translation>
@@ -3556,11 +3658,6 @@
<translation> No at fatu a iscarrigare s'agiornamentu. Aberi %1 pro iscarrigare s'agiornamentu tue etotu.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>No at fatu a controllare is agiornamentos noos.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>Unu nou %1 est a disponimentu. Aberi <a href='%2'>%2</a> pro iscarrigare s'agiornamentu.</translation>
@@ -3571,16 +3668,21 @@
<translation>Su %1 nou est a disponimentu. Aberi %2 pro iscarrigare s'agiornamentu.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Controllu serbidore de is agiornamentos ?</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Non si nd'ischet a cale puntu est s'agiornamentu. Non faghet a cumproare sa si ddoe at agiornamentos noos.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>No ddoe at agiornamentos a disponimentu. S'installatzione tua est a sa versione prus agiornada.</translation>
@@ -3756,11 +3858,6 @@
<translation><font color="green">Conn?tidu in manera curreta a %1: %2 versione %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>URL non b?lidu</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>No at fatu a a si conn?tere a %1 in %2:<br/>%3</translation>
@@ -3771,6 +3868,16 @@
<translation>Tempus isc?didu proende a si conn?tere a %1 in %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Atzessu negadu dae su serbidore. Pro ?ssere seguros de ?ere is permissos giustos, <a href="%1">incarca inoghe</a> pro intrare a su sev?tziu cun su navigadore tuo.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>URL non b?lidu</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation> Intentu de connessione a %1 in %2...</translation>
@@ -3781,11 +3888,6 @@
<translation>Sa dimanda autenticada a su serbidore s'est torrada a deretare a '%1'. Su URL est isballiadu, su serbidore no est cunfiguradu in manera curreta.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Atzessu negadu dae su serbidore. Pro ?ssere seguros de ?ere is permissos giustos, <a href="%1">incarca inoghe</a> pro intrare a su sev?tziu cun su navigadore tuo.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation> Retzida una risposta non b?lida a una dimanda WebDAV autenticada</translation>
@@ -3996,62 +4098,34 @@
<translation>Is n?menes chi agabbant cun unu puntu non sunt suportados in custu arch?viu de sistema.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>Su n?mene de su'arch?viu tenet a su mancu unu car?tere non b?lidu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4061,6 +4135,24 @@
<translation>Su n?mene de s'arch?viu cuntenet tretos a sa fine.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4069,6 +4161,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
@@ -4159,64 +4261,74 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>Tramudadu a un'indiritzu non b?lidu, ripr?stinu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignoradu ca in sa lista niedda de is cosas de no sincronizare</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Non podes ca non tenes su permissu pro agi?nghere sutacartellas a custas cartellas</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation> Non podes ca non tenes su permissu pro agi?nghere arch?vios a custa cartella</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Non podes carrigare custu arch?viu ca in su serbidore podes isceti l?ghere, ripr?stinu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>Non ddu podes bogare, ripr?stinu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Errore leghende sa base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>Su serbidore nd'at torradu un'errore leghende sa cartella "%1" : %2</translation>
</message>
@@ -4224,38 +4336,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Errore agiornende is metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>S'arch?viu est giai impreadu</translation>
</message>
@@ -4273,12 +4385,6 @@
<translation> S'arch?viu %1 non faghet a dd'iscarrigare ca non b'at informatziones de tzifradura.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>Arch?viu cambiadu in pessu rilevadu</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4335,6 +4441,12 @@
<source>The file %1 is currently in use</source>
<translation>S'arch?viu %1 est giai impreadu</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>Arch?viu cambiadu in pessu rilevadu</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4352,39 +4464,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>no at fatu a cantzellare s'arch?viu %1, errore: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>No at fatu a creare sa cartella %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Errore agiornende is metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>S'arch?viu %1 est giai impreadu</translation>
</message>
@@ -4397,14 +4509,14 @@
<translation>No at fatu a nche bogare %1 ca ddoe est unu cunflitu in su n?mene de s'arch?viu locale</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4412,49 +4524,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Errore impostende s'istadu de su pin </translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Errore agiornende is metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>S'arch?viu %1 est giai impreadu</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>No at fatu a torrare a numenare s'arch?viu</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4511,39 +4623,39 @@
<translation>No at fatu a torrare a numenare %1 in %2, errore: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Errore agiornende is metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>S'arch?viu %1 est giai impreadu</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>C?dighe HTTP isballiadu torradu dae su serbidore. Atesu 201, ma retzidu "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Errore impostende s'istadu de su pin </translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Errore iscriende metadatos in sa base de datos</translation>
</message>
@@ -4551,22 +4663,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>Carrigamentu de s'arch?viu criptadu faddidu</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>S'arch?viu %1 non podet ?ssere carrigadu ca ddo est un'?teru arch?viu cun su pr?piu n?mene, ma cun difer?ntzias intre mai?sculas e min?sculas</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation> Su carrigamentu de %1 s?perat sa cuota a cartella</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4574,11 +4675,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Arch?viu bogadu (aviu de su carrigamentu) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation> S'arch?viu locale est istadu modificadu durante sa sincronizatzione. At a ?ssere ripristinadu.</translation>
@@ -4608,6 +4704,22 @@
<source>The file %1 is currently in use</source>
<translation>S'arch?viu %1 est giai impreadu</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation> Su carrigamentu de %1 s?perat sa cuota a cartella</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>Carrigamentu de s'arch?viu criptadu faddidu</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Arch?viu bogadu (aviu de su carrigamentu) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4856,6 +4968,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Cumpartzidura de su menu cuntestuale</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Apo cumpartzidu una cosa cun tegus</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>S?beros de cumpartzidura</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Imbia unu lig?ngiu privadu tr?mite posta eletr?nica ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>C?pia lig?ngios privados in punta de billete</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4888,43 +5026,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Cumpartzidura de su menu cuntestuale</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Seletziona positzione noa ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Apo cumpartzidu una cosa cun tegus</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>S?beros de cumpartzidura</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>C?pia lig?ngios privados in punta de billete</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Imbia unu lig?ngiu privadu tr?mite posta eletr?nica ...</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4940,11 +5052,6 @@
<translation>Non faghet a torrare a cumpartzire custa cartella</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>C?pia lig?ngiu internu</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -4971,12 +5078,6 @@
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Aberi in su navigadore</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Isorve cunflitu ...</translation>
@@ -5006,6 +5107,17 @@
<source>Delete</source>
<translation>Cantzella</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>C?pia lig?ngiu internu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Aberi in su navigadore</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5107,13 +5219,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Custa connessione NO est segura dae chi no est criptada.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Versione serbidore: %1</translation>
@@ -5133,6 +5238,13 @@
<source>The connection is not secure</source>
<translation>Custa connessione no est segura</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Custa connessione NO est segura dae chi no est criptada.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5225,6 +5337,32 @@
<translation>%1 (brincadu pro un'errore pretzedente, proende torra in %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Sunt dispon?biles isceti %1, serbint isceti %2 pro cumintzare</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>Imposs?bile a ab?rrere o a creare sa base de datos locale de sincronizatzione. Segura?ti de ?ere atzessu de iscritura in sa cartella de sincronizatzione.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation> Su logu in su discu est pagu: is iscarrigamentos chi diant p?dere minimare su logu l?beru suta de %1 s'ant a lassare.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>Non b'at logu in su serbidore pro unos cantos carrigamentos. </translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Cunflitu non isortu.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>No at fatu a carrigare custu arch?viu: %1</translation>
@@ -5245,22 +5383,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Cunflitu non isortu.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Sunt dispon?biles isceti %1, serbint isceti %2 pro cumintzare</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>Imposs?bile a ab?rrere o a creare sa base de datos locale de sincronizatzione. Segura?ti de ?ere atzessu de iscritura in sa cartella de sincronizatzione.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Impreu de is arch?vios virtuales, ma su sufissu non est cunfiguradu</translation>
@@ -5280,16 +5402,6 @@
<source>Cannot open the sync journal</source>
<translation>Non faghet a ab?rrerer su registru de sincronizatzione</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation> Su logu in su discu est pagu: is iscarrigamentos chi diant p?dere minimare su logu l?beru suta de %1 s'ant a lassare.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>Non b'at logu in su serbidore pro unos cantos carrigamentos. </translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5300,7 +5412,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5684,11 +5796,6 @@
<source>Less than a minute</source>
<translation>Mancu unu minutu a immoe</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5696,20 +5803,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5724,6 +5821,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5866,6 +5978,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Intra</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>Non b'at cartellas cunfiguradas</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Disconn?tidu dae %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Versione de su serbidore non suportada</translation>
@@ -5886,31 +6013,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Disconn?tidu dae %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Disconn?tidu dae is contos:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Contu %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Intra</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Sa sincronizatzione de su contu est disativada</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5932,11 +6034,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>Non b'at cartellas cunfiguradas</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Controllu de is mod?ficas in "%1" remotu</translation>
@@ -5947,6 +6044,21 @@
<translation>Controllu de is mod?ficas in locale "%1"</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Disconn?tidu dae is contos:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Contu %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Sa sincronizatzione de su contu est disativada</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5955,11 +6067,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Cartella locale</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation type="unfinished"/>
@@ -5995,22 +6102,11 @@
<translation>Pregonta in antis de sincronizare cartellas prus mannas de</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Pregonta in antis de sincronizare archiviatziones de foras</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>S?bera ite est a sincronizare</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Mantene datos locales</translation>
@@ -6025,6 +6121,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Cantzella cartella locale e cumintza una sincronizatzione l?mpia</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>S?bera ite est a sincronizare</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Cartella locale</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6065,6 +6177,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>in futuro </translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>immoe</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Dae pagu tempus</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6105,57 +6262,12 @@
<source>Synced %1</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>in futuro </translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>immoe</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Dae pagu tempus</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6401,6 +6513,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6590,16 +6745,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6614,6 +6759,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6847,16 +7002,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Ammaniende pro sa sincronizatzione</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Ammaniende pro sa sincronizatzione</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Sincronizatzione in pasu</translation>
@@ -6915,4 +7070,17 @@
<translation>Faghe logu </translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_sk.ts nextcloud-desktop-3.16.6/translations/client_sk.ts
--- nextcloud-desktop-3.16.4/translations/client_sk.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_sk.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>Povoli? r?chlu synchroniz?ciu</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>R?chla synchroniz?cia zosynchronizuje iba zmeny v s?boroch a prie?inkoch v r?mci prie?inkov, ktor? boli presk?man?. To m??e v?razne zv??i? odozvu pri po?iato?nej konfigur?cii virtu?lnych s?borov. Sp?sob? to v?ak nadbyto?n? s?ahovanie s?borov presunut?ch do nepresk?man?ho prie?inka.</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>Povoli? virtu?lne s?bory</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -558,7 +550,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Star? import</translation>
</message>
@@ -573,7 +565,7 @@
<translation>Presko?i?</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>Nepodarilo sa importova? ??ty zo star?ej konfigur?cie klienta.</translation>
</message>
@@ -581,33 +573,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Priestor ?lo?iska: ...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Neozna?en? prie?inky bud? <b>odstr?nen?</b> z lok?lneho syst?mu a nebud? u? synchronizovan? na tento po??ta?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Zru?i?</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Pou?i?</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Pripojen? k <server> ako <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Synchronizova? v?etky</translation>
@@ -638,6 +608,33 @@
<translation>Nastavenia pripojenie</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Pou?i?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Priestor ?lo?iska: ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Zru?i?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Pripojen? k <server> ako <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Nie je nastaven? ?iadny u?et.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>End-to-end ?ifrovanie s virtu?lnymi s?bormi</translation>
@@ -672,9 +669,9 @@
<b>Tento proces nie je reverzibiln?. Naozaj chcete pokra?ova??</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Nie je nastaven? ?iadny u?et.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -687,6 +684,11 @@
<translation>Zobrazi? mnemotechnick?</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>Pre tento ??et bolo zapnut? ?ifrovanie po celej d??ke spojenia</translation>
@@ -712,6 +714,12 @@
<translation>Adres?r m? chybu synchroniz?cie. ?ifrovanie tohto prie?inka bude mo?n? po ?spe?nej synchroniz?cii</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -736,12 +744,6 @@
<translation>Nem??em za?ifrova? prie?inok, preto?e dan? prie?inok u? neexituje</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Otvori? prie?inok</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Za?ifrova?</translation>
@@ -780,16 +782,6 @@
<translation>Re?tartova? synchroniz?ciu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Pokra?ova? v synchroniz?cii</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Pozastavi? synchroniz?ciu</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Odstr?ni? prepojenie synchroniz?cie prie?inka</translation>
@@ -815,21 +807,11 @@
<translation>Vytvorenie prie?inka zlyhalo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Nie je mo?n? vytvori? lok?lny prie?inok <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Potvrdi? odstr?nenie prepojenia synchroniz?cie prie?inka</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Naozaj si prajete zastavi? synchroniz?cu prie?inka <i>%1</i>?</p><p><b>Pozn?mka:</b> Toto <b>nevyma?e</b> ?iadne s?bory.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Odstr?ni? prepojenie synchroniz?cie prie?inka</translation>
@@ -863,24 +845,24 @@
<translation>Mnemonick? ?ifrovanie medzi koncov?mi bodmi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>Aby sme chr?nili va?u kryptografick? identitu, za?ifrujeme ju mnemotechnickou pom?ckou pozost?vaj?cou z 12 slov zo slovn?ka. Zap??te si ich a bezpe?ne ich uschovajte. Bud? potrebn? na pridanie ?al??ch zariaden? do v??ho ??tu (napr?klad mobiln?ho telef?nu alebo notebooku).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>Vypn?? ?ifrovanie end-to-end</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>Vypn?? ?ifrovanie po celej d??ke spojenia pre %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>Odstr?nenie end-to-end ?ifrovania odstr?ni lok?lne synchronizovan? s?bory, ktor? s? za?ifrovan?. <br>?ifrovan? s?bory zostan? na serveri.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -893,34 +875,44 @@
<translation>Proces synchroniz?cie pr?ve prebieha.<br/>Chcete ho ukon?i??</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) z %2 je vyu?it?ch. Niektor? prie?inky, vr?tane sie?ov?ch a zdie?an?ch, m??u ma? in? limity.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 sa pou??va</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 z %2 je vyu?it?ch</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>Migrova? certifik?t na nov?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Moment?lne nie s? k dispoz?cii ?iadne inform?cie o vyu?it? ukladacieho priestoru.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>Existuj? prie?inky, ktor?ch ve?kos? presiahla %1 MB: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 sa pou??va</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 ako %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>?ifrovanie end-to-end bolo v tomto ??te povolen? s in?m zariaden?m. <br>Na tomto zariaden? ho mo?no povoli? zadan?m mnemotechnickej pom?cky. <br>Umo?n? to synchroniz?ciu existuj?cich ?ifrovan?ch adres?rov.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>Verzia serveru %1 nie je podporovan?! Pokra?ujte na vlastn? riziko.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Nastavi? ?ifrovanie</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Tento ??et podporuje ?ifrovanie end-to-end</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -938,79 +930,125 @@
<translation>Server %1 je moment?lne v re?ime ?dr?by.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>Server %1 je moment?lne presmerovan? alebo je va?e pripojenie za prihlasovac?m port?lom.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Odhl?sen? z %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Prip?ja sa k %1 ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Tieto prie?inky neboli synchronizovan? preto?e s? pr?li? ve?k?:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>Nepodarilo sa pripoji? k %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Niektor? prie?inky neboli synchronizovan?, preto?e s? na externom ?lo?isku</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Chyba konfigur?cie serveru: %1 na %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Niektor? prie?inky neboli synchronizovan?, preto?e s? pr?li? ve?k? alebo s? na externom ?lo?isku</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>Je potrebn? akceptova? zmluvn? podmienky na %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Otvori? prie?inok</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>?iadne nakonfigurovan? %1 spojenie</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Pokra?ova? v synchroniz?cii</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>Migrova? certifik?t na nov?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Pozastavi? synchroniz?ciu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Tieto prie?inky neboli synchronizovan? preto?e s? pr?li? ve?k?:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Nie je mo?n? vytvori? lok?lny prie?inok <i>%1</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Niektor? prie?inky neboli synchronizovan?, preto?e s? na externom ?lo?isku</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Naozaj si prajete zastavi? synchroniz?cu prie?inka <i>%1</i>?</p><p><b>Pozn?mka:</b> Toto <b>nevyma?e</b> ?iadne s?bory.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Niektor? prie?inky neboli synchronizovan?, preto?e s? pr?li? ve?k? alebo s? na externom ?lo?isku</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>Aby sme chr?nili va?u kryptografick? identitu, za?ifrujeme ju mnemotechnickou pom?ckou pozost?vaj?cou z 12 slov zo slovn?ka. Zap??te si ich a bezpe?ne ich uschovajte. Bud? potrebn? na pridanie ?al??ch zariaden? do v??ho ??tu (napr?klad mobiln?ho telef?nu alebo notebooku).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>Existuj? prie?inky, ktor?ch ve?kos? presiahla %1 MB: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>Vypn?? ?ifrovanie end-to-end</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>?ifrovanie end-to-end bolo v tomto ??te povolen? s in?m zariaden?m. <br>Na tomto zariaden? ho mo?no povoli? zadan?m mnemotechnickej pom?cky. <br>Umo?n? to synchroniz?ciu existuj?cich ?ifrovan?ch adres?rov.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>Vypn?? ?ifrovanie po celej d??ke spojenia pre %1?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Tento ??et podporuje ?ifrovanie end-to-end</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>Odstr?nenie end-to-end ?ifrovania odstr?ni lok?lne synchronizovan? s?bory, ktor? s? za?ifrovan?. <br>?ifrovan? s?bory zostan? na serveri.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Nastavi? ?ifrovanie</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) z %2 je vyu?it?ch. Niektor? prie?inky, vr?tane sie?ov?ch a zdie?an?ch, m??u ma? in? limity.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 z %2 je vyu?it?ch</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Moment?lne nie s? k dispoz?cii ?iadne inform?cie o vyu?it? ukladacieho priestoru.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 ako %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>Verzia serveru %1 nie je podporovan?! Pokra?ujte na vlastn? riziko.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>Server %1 je moment?lne presmerovan? alebo je va?e pripojenie za prihlasovac?m port?lom.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Prip?ja sa k %1 ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>Nepodarilo sa pripoji? k %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Chyba konfigur?cie serveru: %1 na %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>Je potrebn? akceptova? zmluvn? podmienky na %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>?iadne nakonfigurovan? %1 spojenie</translation>
</message>
</context>
<context>
@@ -1125,11 +1163,6 @@
<translation>Certifik?t a k??? (pkcs12) :</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Prech?dza? ...</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Heslo certifik?tu:</translation>
@@ -1140,6 +1173,11 @@
<translation>?ifrovanie pkcs12 zv?zkom je silne odpor??an? ako k?pia ulo?en? v konfigura?nom s?bore.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Prech?dza? ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Vybra? certifik?t</translation>
@@ -1190,34 +1228,34 @@
<translation>Pokra?ova?</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 ??ty</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 ??et</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 prie?inkov</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 prie?inok</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Star? import</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1225,12 +1263,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Chyba pri pr?stupe ku konfigura?n?mu s?boru</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>Pri pr?stupe ku konfigura?n?mu s?boru na %1 sa vyskytla chyba. Uistite sa, ?e v?? pou??vate? m? pr?stup k s?boru.</translation>
</message>
@@ -1272,6 +1310,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1279,6 +1356,11 @@
<translation>S?bor %1 nie je mo?n? nahra?, preto?e existuje in? s?bor s rovnak?m n?zvom, ktor? sa l??i len ve?kostou p?smen</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>S?bor %1 m? neplatn? ?as poslednej zmeny. Nenahr?vajte ho na server.</translation>
@@ -1483,7 +1565,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Chyba pri z?pise metad?t do datab?zy</translation>
</message>
@@ -1613,21 +1695,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Naozaj chcete natrvalo vymaza? prie?inok <i>%1</i> a v?etok jeho obsah?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Naozaj chcete natrvalo vymaza? s?bor <i>%1</i>?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Potvrdi? vymazanie</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1643,30 +1710,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Nie je nastaven? ?iadny Nextcloud ??et</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Naozaj chcete natrvalo vymaza? prie?inok <i>%1</i> a v?etok jeho obsah?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Chyba overenia: Pou??vate?sk? meno alebo heslo nie je spr?vne.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Naozaj chcete natrvalo vymaza? s?bor <i>%1</i>?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Potvrdi? vymazanie</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>?asov? limit</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Poskytnut? poverenia nie s? spr?vne</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>Server nakonfigurovan? pre tohto klienta je pr?li? star?</translation>
@@ -1676,16 +1743,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Pros?m aktualizujte na najnov?iu verziu servera a re?tartujte klienta.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Chyba overenia: Pou??vate?sk? meno alebo heslo nie je spr?vne.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Nie je nastaven? ?iadny Nextcloud ??et</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Poskytnut? poverenia nie s? spr?vne</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Chyba pri ru?en? odstr?nenia s?boru</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>Chyba pri ru?en? odstr?nenia %1</translation>
</message>
@@ -1693,19 +1775,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Chyba servera: odpove? PROPFIND nie je vo form?te XML.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>Chyba nastavenia ?ifrovan?ch metad?t!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>Chyba nastavenia ?ifrovan?ch metad?t: po?iato?n? podpis zo servera je pr?zdny.</translation>
</message>
@@ -1713,27 +1795,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Chyba pri otv?ran? adres?ra %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Prie?inok nie je pr?stupn? pre klienta, pr?stup odmietnut?</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Adres?r nebol n?jden?: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>K?dovanie znakov n?zvu s?boru je neplatn?</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Chyba pri na??tavan? adres?ra %1</translation>
</message>
@@ -1973,11 +2055,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>URL adresa pre dotazovanie sa neza??na na HTTPS, napriek tomu, ?e prihlasovacia adresa sa na HTTPS za??na. Prihl?senie nebude umo?nen?, preto?e by to mohol by? bezpe?nostn? probl?m. Obr??te sa na svojho spr?vcu.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>Vr?ten? URL adresa neza??na na HTTPS, ka?dop?dne adresa pre prihl?senie na HTTPS za??na. Prihl?senie nebude umo?nen?, preto?e by to mohol by? bezpe?nostn? probl?m. Obr??te sa na svojho spr?vcu.</translation>
@@ -1989,28 +2066,33 @@
<translation>Chyba vr?ten? zo servera: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>URL adresa pre dotazovanie sa neza??na na HTTPS, napriek tomu, ?e prihlasovacia adresa sa na HTTPS za??na. Prihl?senie nebude umo?nen?, preto?e by to mohol by? bezpe?nostn? probl?m. Obr??te sa na svojho spr?vcu.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Chyba pri pr?stupe k 'tokenu' endpoint: <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Nie je mo?n? spracova? JSON odpove? zo servera: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>Odpove? zo servera neobsahuje v?etky o?ak?van? polia</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation>Odpove? zo servera neobsahuje v?etky o?ak?van? polia: <br><em>%1</em></translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Nie je mo?n? spracova? JSON odpove? zo servera: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2053,6 +2135,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 bol zmazan?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 bol aktualizovan?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 bol premenovan? na %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 bol presunut? do %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>Pros?m, vyberte in? umiestnenie. Adres?r %1 neexistuje.</translation>
@@ -2068,17 +2178,6 @@
<translation>Pros?m, vyberte in? umiestnenie. %1 nie je ?itate?n? adres?r.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 a %n in? s?bor bol odstr?nen?.</numerusform><numerusform>%1 a %n in? s?bory boli odstr?nen?.</numerusform><numerusform>%1 a %n in?ch s?borov bolo odstr?nen?ch.</numerusform><numerusform>%1 a %n in?ch s?borov bolo odstr?nen?ch.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 bol zmazan?.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 a %n in?ch s?bor(ov) bolo pridan?ch.</numerusform><numerusform>%1 a %n in?ch s?bor(ov) bolo pridan?ch.</numerusform><numerusform>%1 a %n in?ch s?bor(ov) bolo pridan?ch.</numerusform><numerusform>%1 a %n in?ch s?bor(ov) bolo pridan?ch.</numerusform></translation>
@@ -2094,33 +2193,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 a %n in? s?bor bol nahrat?.</numerusform><numerusform>%1 a %n in? s?bory boli nahrat?.</numerusform><numerusform>%1 a %n in?ch s?borov bolo nahrat?ch.</numerusform><numerusform>%1 a %n in?ch s?borov bolo nahrat?ch.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 bol aktualizovan?.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 bol premenovan? na %2 a %n in? s?bor bol premenovan?.</numerusform><numerusform>%1 bol premenovan? na %2 a %n in? s?bory boli premenovan?.</numerusform><numerusform>%1 bol premenovan? na %2 a %n in?ch s?borov bolo premenovan?ch.</numerusform><numerusform>%1 bol premenovan? na %2 a %n in?ch s?borov bolo premenovan?ch.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 bol premenovan? na %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 bol presunu? do %2 a %n in?ch s?bor bol presunut?.</numerusform><numerusform>%1 bol presunu? do %2 a %n in? s?bory boli presunut?.</numerusform><numerusform>%1 bol presunu? do %2 a %n in?ch s?borov bolo presunut?ch.</numerusform><numerusform>%1 bol presunu? do %2 a %n in?ch s?borov bolo presunut?ch.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 bol presunut? do %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2157,68 +2239,68 @@
<translation>Aktivita synchroniz?cie</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Nemo?no ??ta? syst?mov? exclude file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Bol pridan? nov? prie?inok v???? ako %1 MB: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Bol pridan? prie?inok z extern?ho ?lo?iska.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Ak si to prajete prevzia?, tak prejdite do nastaven? a vyberte to.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>Prie?inok prekro?il nastaven? limit ve?kosti prie?inka %1 MB: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>Pokra?ova? v synchroniz?ci?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>Zastavi? synchroniz?ciu</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>Prie?inok %1 prekro?il nastaven? limit ve?kosti prie?inka %2 MB.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>Chcete vypn?? synchroniz?ciu tohto prie?inka?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Prie?inok %1 bol vytvoren?, ale bol u? sk?r vyl??en? zo synchroniz?cie. Nebude preto synchronizovan?.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>S?bor %1 bol vytvoren?, ale bol u? sk?r vyl??en? zo synchroniz?cie. Nebude preto synchronizovan?.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2231,12 +2313,12 @@
% 1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>Virtu?lny s?bor sa nepodarilo stiahnu? s k?dom "%1", stavom "%2" a chybovou spr?vou "%3"</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2245,7 +2327,7 @@
Pr?padne m??ete obnovi? v?etky vymazan? s?bory ich nahran?m z adres?ra '%1' na server.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2254,22 +2336,22 @@
Pr?padne m??ete obnovi? v?etky odstr?nen? s?bory ich stiahnut?m zo servera.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>Odstr?ni? v?etky s?bory?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>Pokra?ova? s odstr?nen?m</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>Obnovi? s?bory na Serveri</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>Obnovi? s?bory zo Servera</translation>
</message>
@@ -2310,11 +2392,6 @@
<translation>Nemo?no resetova? stav prie?inka</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>Bol n?jden? star? ?urn?l synchroniz?cie "%1", av?ak nem??e by? odstr?nen?. Pros?m uistite sa, ?e ?iadna aplik?cia ho pr?ve nevyu??va.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation> (z?loha)</translation>
@@ -2325,6 +2402,11 @@
<translation> (z?loha %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>Bol n?jden? star? ?urn?l synchroniz?cie "%1", av?ak nem??e by? odstr?nen?. Pros?m uistite sa, ?e ?iadna aplik?cia ho pr?ve nevyu??va.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Nedefinovan? stav.</translation>
@@ -2395,16 +2477,6 @@
<translation>?iados? o synchroniz?ciu bola zru?en?.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Synchroniz?cia je pozastaven?.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (Synchroniz?cia je pozastaven?)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>Pros?m, vyberte in? umiestnenie. Vybran? adres?r nie je platn?.</translation>
@@ -2454,6 +2526,16 @@
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.</translation>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Synchroniz?cia je pozastaven?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (Synchroniz?cia je pozastaven?)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2497,16 +2579,6 @@
<translation>Pri na??tavn? zoznamu prie?inkov zo servera nastala chyba.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Na??tava sa zoznam prie?inkov zo servera?</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Existuj? nevyrie?en? konflikty. Podrobnosti zobraz?te kliknut?m.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>Podpora virtu?lnych s?borov povolen?.</translation>
@@ -2548,16 +2620,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>S?ahovanie %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>S?bor %1 z %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Existuj? nevyrie?en? konflikty. Podrobnosti zobraz?te kliknut?m.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>S?ahovanie %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Na??tava sa zoznam prie?inkov zo servera?</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2604,21 +2691,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 z %2, s?bor %3 z %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>S?bor %1 z %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>?ak? sa na %n prie?inok...</numerusform><numerusform>?ak? sa na %n prie?inky...</numerusform><numerusform>?ak? sa na %n prie?inkov...</numerusform><numerusform>?ak? sa na %n prie?inkov...</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>O chv??u sa spust? synchroniz?cia</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>?ak? sa na %n prie?inok...</numerusform><numerusform>?ak? sa na %n prie?inky...</numerusform><numerusform>?ak? sa na %n prie?inkov...</numerusform><numerusform>?ak? sa na %n prie?inkov...</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2778,11 +2860,6 @@
<translation>V?eobecn? nastavenia</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>Spusti? pri ?tarte syst?mu</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>Zobrazi? upozornenia na hovory</translation>
@@ -2793,11 +2870,6 @@
<translation>Pre oznamovaciu oblas? syst?mov?ho panela</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Pou?i? &monochromatick? ikony</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>Zobrazi? upozornenia na Chat</translation>
@@ -2813,17 +2885,32 @@
<translation>Roz??ren?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Po?iada? o potvrdenie pred synchroniz?ciou nov?ch prie?inkov v????ch ne?</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Po?iada? o potvrdenie pred synchroniz?ciou extern?ch ?lo??sk</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>Spusti? pri ?tarte syst?mu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Pou?i? &monochromatick? ikony</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Po?iada? o potvrdenie pred synchroniz?ciou nov?ch prie?inkov v????ch ne?</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>Upozorni?, ke? synchronizovan? prie?inky presiahnu stanoven? limit</translation>
@@ -2834,11 +2921,6 @@
<translation>Automaticky zak?za? synchroniz?ciu prie?inkov, ktor? limit presiahnu</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Po?iada? o potvrdenie pred synchroniz?ciou extern?ch ?lo??sk</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>Pres?va? vymazan? s?bory do ko?a</translation>
@@ -2890,11 +2972,6 @@
<translation>Aktualizova? kan?l</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Restart && aktualiz?cia</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>&Automaticky kontrolova? aktualiz?cie</translation>
@@ -2915,6 +2992,16 @@
<translation>Pr?vne upozornenie</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Restart && aktualiz?cia</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Zobrazova? hl?senie, ktor? vy?aduj? pozornos?.</translation>
@@ -2935,6 +3022,11 @@
<translation>Nem??ete vypn?? auto?tart preto?e auto?tart je zapnut? na syst?mov ?rovni.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>stabiln?</translation>
@@ -3016,6 +3108,11 @@
<source>Debug archive is created at %1</source>
<translation>Arch?v ladiacich inform?ci? vytvoren? %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3180,102 +3277,97 @@
<translation>Nov? n?zov s?boru</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Premenova? s?bor</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>S?bor "%1" nebolo mo?n? synchronizova?, preto?e n?zov obsahuje znaky, ktor? nie s? v tomto syst?me povolen?.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>Nasleduj?ce znaky nie s? v syst?me povolen?: * " | & ? , ; : \ / ~ < > medzery na za?iatku/na konci</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>S?bor "%1" nebolo mo?n? synchronizova?, preto?e n?zov obsahuje znaky, ktor? nie s? povolen? serverom.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>Nasleduj?ce znaky nie s? povolen?: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>Nasleduj?ce n?zvy nie su povolen?: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>Nasleduj?ce n?zvy s?borov nie su povolen?: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>Nasleduj?ce pr?pony s?borov nie su povolen?: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Kontroluje sa opr?vnenie na premenovanie ?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>Nem?te opr?vnenie premenova? tento s?bor. Pros?m po?iadajte vlastn?ka s?boru o premenovanie.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>Nepodarilo sa na??ta? opr?vnenia s chybou %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>N?zov s?boru obsahuje medzery na za?iatku a na konci.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>N?zov s?boru obsahuje medzery na za?iatku.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>N?zov s?boru obsahuje medzery na konci.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>Pou?i? neplatn? meno</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>N?zov s?boru obsahuje neplatn? znaky: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>Nem??em premenova? s?bor. Pros?m uistite sa ?e ste pripojen? k serveru.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>Nem??em premenova? s?bor preto?e s?bor s rovnak?m menom u? na serveri existuje. Pros?m vyberte in? meno.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>Nie je mo?n? premenova? lok?lny s?bor. %1</translation>
</message>
@@ -3399,16 +3491,6 @@
<translation><p>Je dostupn? nov? verzia klienta %1.</p><p><b>%2</b> je dostupn? na stiahnutie. Nain?talovan? verzia je %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Tentoraz presko?i?</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Aktualizova? teraz</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>Aktualiz?cia sa nepodarila</translation>
@@ -3433,6 +3515,16 @@
<source>Update manually</source>
<translation>Aktualizova? manu?lne</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Tentoraz presko?i?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Aktualizova? teraz</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3457,6 +3549,23 @@
<translation>Proxy server vy?aduje overenie</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>D?tov? ??rka pre download</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Obmedzi? na</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytov/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>Pozn?mka: nastavenia proxy nemaj? ?iadny efekt pre ??ty na localhoste</translation>
@@ -3479,46 +3588,29 @@
<translation>Pou?i? glob?lne nastavenia</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>D?tov? ??rka pre download</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Bez obmedzenia</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytov/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Obmedzi? na</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Obmedzi? na 3/4 z odhadovanej ??rky p?sma</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>D?tov? ??rka pre upload</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Obmedzova? automaticky</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>D?tov? ??rka pre upload</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Hostname (hostite?sk? meno) proxy servera</translation>
@@ -3547,6 +3639,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>Nem??em skontrolova? dostupnos? aktualiz?cie.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Prebieha kontrola aktualiza?n?ho servera...</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>Pripraven? je nov? aktualiz?cia %1</translation>
@@ -3577,11 +3679,6 @@
<translation>Nem??em stiahnu? aktualiz?ciu. Otvorte pros?m %1 pre ru?n? stiahnutie aktualiz?cie.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>Nem??em skontrolova? dostupnos? aktualiz?cie.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>Je dostupn? nov? %1. Pre stiahnutie kliknite <a href='%2'>%2</a> pre stiahnutie aktualiz?cie.</translation>
@@ -3592,16 +3689,21 @@
<translation>Je dostupn? nov? %1. Pros?m otvorte %2 pre stiahnutie aktualiz?cie.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Prebieha kontrola aktualiza?n?ho servera...</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Stav aktualiz?cie nie je zn?my: Neboli skontrolovan? nov? aktualiz?cie.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>?iadne aktualiz?cie nie s? k dispoz?cii. Pou??vate aktu?lnu verziu.</translation>
@@ -3777,11 +3879,6 @@
<translation><font color="green">?spe?ne pripojen? k %1: %2 verzie %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>Neplatn? URL</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Zlyhalo spojenie s %1 o %2:<br/>%3</translation>
@@ -3792,6 +3889,16 @@
<translation>?asov? limit vypr?al pri pokuse o pripojenie k %1 na %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Pr?stup zamietnut? serverom. Po overen? spr?vnych pr?stupov?ch pr?v, <a href="%1">kliknite sem</a> a otvorte slu?bu v svojom prezera?i.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>Neplatn? URL</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Pokus o pripojenie k %1 na %2...</translation>
@@ -3802,11 +3909,6 @@
<translation>Overen? po?iadavka na server bola presmerovan? na "%1". URL je zl?, server nie je spr?vne nakonfigurovan?.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Pr?stup zamietnut? serverom. Po overen? spr?vnych pr?stupov?ch pr?v, <a href="%1">kliknite sem</a> a otvorte slu?bu v svojom prezera?i.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>Neplatn? odpove? na overen? WebDAV po?iadavku</translation>
@@ -4018,62 +4120,34 @@
<translation>N?zvy s?borov kon?iacich bodkou nie s? na tomto s?borovom syst?me podporovan?.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Adres?r</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>S?bor</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>N?zov %1 obsahuje znak "%2" ktor? nie je podporovan? na tomto s?borovom syst?me.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>N?zov %1 obsahuje aspo? jeden neplatn? znak</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>N?zov %1 je na tomto s?borovom syst?me rezervovan?m n?zvom.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>N?zov s?boru obsahuje nepovolen? znak</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4083,6 +4157,24 @@
<translation>N?zov s?boru obsahuje medzery na konci.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Adres?r</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>S?bor</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>N?zov %1 obsahuje znak "%2" ktor? nie je podporovan? na tomto s?borovom syst?me.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4091,6 +4183,16 @@
<translation>Nem??e by? premenovan? alebo narhran?.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>N?zov %1 obsahuje aspo? jeden neplatn? znak</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>N?zov %1 je na tomto s?borovom syst?me rezervovan?m n?zvom.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>N?zov s?boru obsahuje medzery na za?iatku.</translation>
@@ -4181,64 +4283,74 @@
<translation>Server nevr?til ?iadne %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Chyba pri synchroniz?cii z d?vodu neplatn?ho ?asu poslednej zmeny</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>S?bor sa nepodarilo nahra?, preto?e je otvoren? v "%1".</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>Chyba pri mazan? z?znamu o s?bore %1 z datab?zy</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>Presunut? do neplatn?ho cie?a, obnovujem</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>Nie je mo?n? upravi? ?ifrovan? polo?ku, preto?e vybrat? certifik?t nie je platn?.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorovan? pod?a nastavenia "vybra? ?o synchronizova?"</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Nie je dovolen?, lebo nem?te opr?vnenie prid?va? podprie?inky do tohto prie?inka</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Nie je mo?n?, preto?e nem?te opr?vnenie prid?va? s?bory do tohto prie?inka</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Nie je dovolen? tento s?bor nahra?, preto?e je na serveri iba na ??tanie, obnovujem</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>Nie je dovolen? odstr?ni?, obnovujem</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Chyba pri ??tan? z datab?ze</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>Server odpovedal chybne po?as na??tania prie?inka "%1" : %2</translation>
</message>
@@ -4246,38 +4358,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>Nie je mo?n? vymaza? s?bor %1 z lok?lnej DB</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>Chyba pri aktualiz?cii metad?t z d?vodu neplatn?ho ?asu poslednej zmeny</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>Prie?inok %1 nem??e by? nastaven? len na ??tanie: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>nezn?ma chyba</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Chyba pri aktualiz?cii metad?t: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>S?bor sa v s??asnosti pou??va</translation>
</message>
@@ -4295,12 +4407,6 @@
<translation>S?bor %1 nie je mo?n? prevzia?, preto?e ch?baj? inform?cie o ?ifrovan?.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>S?bor sa medzit?m zmenil</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4357,6 +4463,12 @@
<source>The file %1 is currently in use</source>
<translation>S?bor %1 sa v s??asnosti pou??va</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>S?bor sa medzit?m zmenil</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4374,39 +4486,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>nie je mo?n? vymaza? s?bor %1, chyba: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>Prie?inok %1 nem??e by? vytvoren? kv?li kol?zii s lok?lnym n?zvom s?boru alebo adres?ra!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>Nem??em vytvori? prie?inok %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>Prie?inok %1 nem??e by? nastaven? len na ??tanie: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>nezn?ma chyba</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Chyba pri aktualiz?cii metad?t: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>S?bor %1 sa v s??asnosti pou??va</translation>
</message>
@@ -4419,14 +4531,14 @@
<translation>Nemo?no odstr?ni? %1 z d?vodu kol?zie n?zvu s?boru s lok?lnym s?borom</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation>Do?asn? chyba pri odstra?ovan? lok?lnej polo?ky odstr?nenej zo servera.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Nie je mo?n? vymaza? z?znam o s?bore %1 z lok?lnej DB</translation>
</message>
@@ -4434,49 +4546,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>Adres?r %1 nem??e by? premenovan? z d?vodu kol?zie s menom lok?lneho s?boru alebo adres?ra.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>S?bor %1 bol stiahnut?, ale do?lo k kol?zii n?zvov lok?lnych s?borov!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>Nie je mo?n? z?ska? s?bor %1 z lok?lnej DB</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Chyba pri nastavovan? stavu pin-u</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Chyba pri aktualiz?cii metad?t: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>S?bor %1 sa v s??asnosti pou??va</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>Zlyhala propag?cia premenovania adres?ra v hierarchii.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Nepodarilo sa premenova? s?bor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Nie je mo?n? vymaza? z?znam o s?bore %1 z lok?lnej DB</translation>
</message>
@@ -4533,39 +4645,39 @@
<translation>nie je mo?n? premenova? %1 na %2, chyba: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Chyba pri aktualiz?cii metad?t: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>S?bor %1 sa v s??asnosti pou??va</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Server vr?til neplatn? HTTP k?d. O?ak?van? bol 201, ale vr?ten? bol "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>Nie je mo?n? z?ska? s?bor %1 z lok?lnej DB</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Nie je mo?n? vymaza? z?znam o s?bore %1 z lok?lnej DB</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Chyba pri nastavovan? stavu pin-u</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Chyba pri z?pise metad?t do datab?zy</translation>
</message>
@@ -4573,22 +4685,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>Zlyhalo nahr?vanie ?ifrovan?ho s?boru.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>S?bor %1 nie je mo?n? nahra?, preto?e existuje in? s?bor s rovnak?m n?zvom, ktor? sa l??i len ve?kostou p?smen</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>Nahranie %1 prekra?uje kv?tu, ktor? je pre prie?inok nastaven?</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4596,11 +4697,6 @@
<translation>S?bor %1 m? neplatn? ?as poslednej zmeny. Nenahr?vajte ho na server.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>S?bor odobrat? (spusti? nahr?vanie) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Lok?lny s?bor bol zmenen? po?as synchroniz?cie. Bude obnoven?.</translation>
@@ -4630,6 +4726,22 @@
<source>The file %1 is currently in use</source>
<translation>S?bor %1 sa v s??asnosti pou??va</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>Nahranie %1 prekra?uje kv?tu, ktor? je pre prie?inok nastaven?</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>Zlyhalo nahr?vanie ?ifrovan?ho s?boru.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>S?bor odobrat? (spusti? nahr?vanie) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4878,6 +4990,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Kontextov? menu zdie?ania</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Nie?o som v?m zdie?al</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Mo?nosti zdie?ania</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Odosla? priv?tny odkaz e-mailom?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Kop?rova? priv?tny odkaz do schr?nky</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>Nepodarilo sa za?ifrova? adres?r na adrese "%1"</translation>
@@ -4912,43 +5050,17 @@
<translation>Tento adres?r bol ?spe?ne za?ifrovan?: "%1"</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Kontextov? menu zdie?ania</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Zadajte nov? polohu ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Nie?o som v?m zdie?al</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Mo?nosti zdie?ania</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Aktivity</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Kop?rova? priv?tny odkaz do schr?nky</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Odosla? priv?tny odkaz e-mailom?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>Opusti? toto zdie?anie</translation>
@@ -4964,11 +5076,6 @@
<translation>Op?tovn? zdie?anie tohto prie?inka je zak?zan?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Kop?rova? intern? odkaz</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>Za?ifrova?</translation>
@@ -4995,12 +5102,6 @@
<translation><numerusform>Vypr?? za %1 min?tu</numerusform><numerusform>Vypr?? za %1 min?ty</numerusform><numerusform>Vypr?? za %1 min??</numerusform><numerusform>Vypr?? za %1 min??</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Otvori? v prehliada?i</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Vyrie?i? konflikt ...</translation>
@@ -5030,6 +5131,17 @@
<source>Delete</source>
<translation>Zmaza?</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Kop?rova? intern? odkaz</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Otvori? v prehliada?i</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5131,13 +5243,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Toto spojenie NIE JE bezpe?n?, preto?e nie je ?ifrovan?.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Verzia servera: %1</translation>
@@ -5157,6 +5262,13 @@
<source>The connection is not secure</source>
<translation>Pripojenie nie je bezpe?n?</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Toto spojenie NIE JE bezpe?n?, preto?e nie je ?ifrovan?.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5249,6 +5361,32 @@
<translation>%1 (vynechan? kv?li predch?dzaj?cej chybe, ?al?? pokus o %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Je dostupn?ch len %1, pre spustenie je potrebn?ch aspo? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>Nie je mo?n? otvori? alebo vytvori? miestnu synchroniza?n? datab?zu. Skontrolujte ?i m?te pr?vo na z?pis do synchroniza?n?ho prie?inku.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Na disku doch?dza vo?n? miesto. S?ahovanie, ktor? by zmen?ilo vo?n? miesto pod %1 bude vynechan?.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>Na serveri nie je pre niektor? z nahr?van?ch s?borov dostatok vo?n?ho miesta.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Nevyrie?en? konflikt.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>Nem??em aktualizova? s?bor: %1</translation>
@@ -5269,22 +5407,6 @@
<translation>Nie je mo?n? vytvori? z?znam o s?bore v lok?lnej DB: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Nevyrie?en? konflikt.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Je dostupn?ch len %1, pre spustenie je potrebn?ch aspo? %2</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>Nie je mo?n? otvori? alebo vytvori? miestnu synchroniza?n? datab?zu. Skontrolujte ?i m?te pr?vo na z?pis do synchroniza?n?ho prie?inku.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Pou??vate virtu?lne s?bory s pr?ponou, ale pr?pona nie je nastaven?</translation>
@@ -5304,16 +5426,6 @@
<source>Cannot open the sync journal</source>
<translation>Nemo?no otvori? sync ?urn?l</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Na disku doch?dza vo?n? miesto. S?ahovanie, ktor? by zmen?ilo vo?n? miesto pod %1 bude vynechan?.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>Na serveri nie je pre niektor? z nahr?van?ch s?borov dostatok vo?n?ho miesta.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5324,7 +5436,7 @@
<translation>Odpojen?</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>Je potrebn? akceptova? zmluvn? podmienky</translation>
</message>
@@ -5708,11 +5820,6 @@
<source>Less than a minute</source>
<translation>Menej ako min?ta</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5720,20 +5827,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1 min?ta</numerusform><numerusform>%1 min?ty</numerusform><numerusform>%1 min?t</numerusform><numerusform>%1 min?t</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1 hodina</numerusform><numerusform>%1 hodiny</numerusform><numerusform>%1 hod?n</numerusform><numerusform>%1 hod?n</numerusform></translation>
@@ -5748,6 +5845,21 @@
<source>%1 days</source>
<translation><numerusform>%1 de?</numerusform><numerusform>%1 dni</numerusform><numerusform>%1 dn?</numerusform><numerusform>%1 dn?</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5890,6 +6002,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Prihl?ste sa pros?m</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>Nie s? nastaven? ?iadne prie?inky na synchroniz?ciu.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Odpojen? od %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Nepodporovan? verzia servera</translation>
@@ -5910,31 +6037,6 @@
<translation>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.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Odpojen? od %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Odpojen? od ??tov:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>??et %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Prihl?ste sa pros?m</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Synchroniz?cia ??tu je vypnut?</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5956,11 +6058,6 @@
<translation>macOS VFS pre %1: Vyskytol sa probl?m.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>Nie s? nastaven? ?iadne prie?inky na synchroniz?ciu.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Kontroluj? sa zmeny vo vzdialenom "%1"</translation>
@@ -5971,6 +6068,21 @@
<translation>Kontroluj? sa zmeny v lok?lnom "%1"</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Odpojen? od ??tov:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>??et %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Synchroniz?cia ??tu je vypnut?</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5979,11 +6091,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Lok?lny prie?inok</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>U??vate?sk? meno</translation>
@@ -6019,22 +6126,11 @@
<translation>Po?iada? o potvrdenie pred synchroniz?ciou prie?inkov v????ch ne?</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Po?iada? o potvrdenie pred synchroniz?ciou extern?ch ?lo??sk</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Vybra? ?o synchronizova?</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Ponecha? lok?lne d?ta</translation>
@@ -6049,6 +6145,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Vymaza? lok?lny prie?inok a za?at synchroniz?ciu na?isto</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Vybra? ?o synchronizova?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Lok?lny prie?inok</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6089,6 +6201,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>v bud?cnosti</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1 min?ta</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%n min?ta</numerusform><numerusform>%n min?ty</numerusform><numerusform>%n min?t</numerusform><numerusform>%n min?t</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>teraz</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Pred ist?m ?asom</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6129,57 +6286,12 @@
<source>Synced %1</source>
<translation>Zosynchronizovan? %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>v bud?cnosti</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>teraz</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1 min?ta</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%n min?ta</numerusform><numerusform>%n min?ty</numerusform><numerusform>%n min?t</numerusform><numerusform>%n min?t</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Pred ist?m ?asom</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation>Pri odstra?ovan? s?boru sa vyskytla chyba</translation>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>Cesty za??naj?ce znakom '#' nie s? podporovan? v m?de VFS.</translation>
@@ -6425,6 +6537,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>Otvori? miestne alebo skupinov? prie?inky</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Otvori? lok?lny prie?inok</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Pripojen?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>Odpojen?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>Otvori? lok?lny prie?inok "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>Otvori? skupinov? adres?r "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>Otvori? %1 v prehliada?i s?borov</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>U??vate?sk? skupina a menu miestnych adres?rov</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6614,16 +6769,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6638,6 +6783,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6871,16 +7026,16 @@
<translation>Po?as nastavovania nastala chyba</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Pr?prava na synchroniz?ciu</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>Zastavovanie synchroniz?cie</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Pr?prava na synchroniz?ciu</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Synchroniz?cia je pozastaven?</translation>
@@ -6939,4 +7094,17 @@
<translation>Uvo?ni? lok?lny priestor</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>Povoli? r?chlu synchroniz?ciu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>R?chla synchroniz?cia zosynchronizuje iba zmeny v s?boroch a prie?inkoch v r?mci prie?inkov, ktor? boli presk?man?. To m??e v?razne zv??i? odozvu pri po?iato?nej konfigur?cii virtu?lnych s?borov. Sp?sob? to v?ak nadbyto?n? s?ahovanie s?borov presunut?ch do nepresk?man?ho prie?inka.</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_sl.ts nextcloud-desktop-3.16.6/translations/client_sl.ts
--- nextcloud-desktop-3.16.4/translations/client_sl.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_sl.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>Omogo?i hitro usklajevanje</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>Omogo?i navidezne datoteke</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Uvoz opu??enih podatkov</translation>
</message>
@@ -570,7 +562,7 @@
<translation>Presko?i</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>Ni mogo?e uvoziti ra?unov iz opu??enih nastavitev odjemalca.</translation>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Prostor shrambe: ...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Neizbrane mape bodo <b>odstranjene</b> s krajevnega datote?nega sistema in s tem ra?unalnikom ne bodo ve? usklajevane!</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Prekli?i</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Uveljavi</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Vzpostavljena je povezava s stre?nikom <server> kot <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Uskladi vse</translation>
@@ -635,6 +605,33 @@
<translation>Nastavitve povezave</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Uveljavi</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Prostor shrambe: ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Prekli?i</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Vzpostavljena je povezava s stre?nikom <server> kot <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Ni nastavljenega ra?una.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>Celovito ?ifriranje E2E za navidezne datoteke</translation>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Ni nastavljenega ra?una.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation>Poka?i mnemoniko</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>Za ta ra?un je omogo?eno celovito ?ifriranje E2E</translation>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -731,12 +739,6 @@
<translation>Mape ni mogo?e ?ifrirati, ker ne obstaja ve?.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Odpri mapo</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>?ifriraj</translation>
@@ -775,16 +777,6 @@
<translation>Ponovno za?eni usklajevanje</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>Nadaljuj z usklajevanjem</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Premor usklajevanja</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Odstrani povezavo za usklajevanje mape</translation>
@@ -810,21 +802,11 @@
<translation>Ustvarjanje mape je spodletelo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Ni mogo?e ustvariti krajevne mape <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Potrdi odstranjevanje povezave usklajevanja mape</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Ali res ?elite zaustaviti usklajevanje mape <i>%1</i>?</p><p><b>Opomba:</b> s tem datoteke iz odjemalca <b>ne bodo</b> odstranjene.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Odstrani povezavo za usklajevanje mape</translation>
@@ -858,23 +840,23 @@
<translation>Mnemonika celostnega ?ifriranja</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>Onemogo?i celovito ?ifriranje E2E</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>Ali ?elite onemogo?iti celovito ?ifriranje E2E za %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -888,34 +870,44 @@
<translation>Izvaja se usklajevanje.<br/>Ali ?elite opravilo prekiniti?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) od %2 v uporabi. Nekatere mape, vklju?no s priklopljenimi mapami in mapami v souporabi, imajo morda razli?ne omejitve.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>Skupna velikost je %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 od %2 v uporabi</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>Trenutno ni na voljo nobenih podatkov o porabi prostora.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>Skupna velikost je %1</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 z ra?unom %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>Razli?ica stre?nika %1 ni podprta! Nadaljujete na lastno odgovornost.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Nastavitev ?ifriranja</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Ra?un podpira celovito ?ifriranje E2E</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -933,79 +925,125 @@
<translation>Stre?nik %1 je trenutno v vzdr?evalnem na?inu.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Uspe?no odjavljeno iz %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Poteka vzpostavljanje povezave s stre?nikom %1 ...</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Zaznane so mape, ki zaradi omejitve velikosti niso bile usklajene: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>Vzpostavitev povezave z %1 je spodletela.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Zaznane so mape, ki so del zunanje shrambe, zato niso bile usklajene: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Napaka nastavitve stre?nika: %1 na %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Zaznane so mape, ki zaradi omejitve velikosti, ali zato, ker so del zunanje shrambe, niso bile usklajene: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Odpri mapo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>Nadaljuj z usklajevanjem</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Premor usklajevanja</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Ni mogo?e ustvariti krajevne mape <i>%1</i>.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Ali res ?elite zaustaviti usklajevanje mape <i>%1</i>?</p><p><b>Opomba:</b> s tem datoteke iz odjemalca <b>ne bodo</b> odstranjene.</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Ni nastavljene povezave %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>Onemogo?i celovito ?ifriranje E2E</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>Ali ?elite onemogo?iti celovito ?ifriranje E2E za %1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Zaznane so mape, ki zaradi omejitve velikosti niso bile usklajene: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) od %2 v uporabi. Nekatere mape, vklju?no s priklopljenimi mapami in mapami v souporabi, imajo morda razli?ne omejitve.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Zaznane so mape, ki so del zunanje shrambe, zato niso bile usklajene: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 od %2 v uporabi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Zaznane so mape, ki zaradi omejitve velikosti, ali zato, ker so del zunanje shrambe, niso bile usklajene: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>Trenutno ni na voljo nobenih podatkov o porabi prostora.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 z ra?unom %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>Razli?ica stre?nika %1 ni podprta! Nadaljujete na lastno odgovornost.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Ra?un podpira celovito ?ifriranje E2E</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Poteka vzpostavljanje povezave s stre?nikom %1 ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Nastavitev ?ifriranja</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>Vzpostavitev povezave z %1 je spodletela.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Napaka nastavitve stre?nika: %1 na %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Ni nastavljene povezave %1.</translation>
</message>
</context>
<context>
@@ -1120,11 +1158,6 @@
<translation>Potrdilo in klju? (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Prebrskaj ...</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Geslo potrdila:</translation>
@@ -1135,6 +1168,11 @@
<translation>S pkcs12 ?ifriran paket je priporo?en, saj je kopija shranjena v nastavitveni datoteki.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Prebrskaj ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Izbor potrdila</translation>
@@ -1185,46 +1223,46 @@
<translation>Nadaljuj</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 ra?unov</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 ra?un</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 map</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 mapa</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Opu??eno uva?anje</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Napaka dostopa do nastavitvene datoteke</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>Med dostopom do nastavitvene datoteke na %1 je pri?lo do napake. Preverite, ali je dostopna z uporabni?kim ra?unom.</translation>
</message>
@@ -1266,6 +1304,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1273,6 +1350,11 @@
<translation>Datoteke %1 ni mogo?e nalo?iti, saj obstaja druga, istoimenska datoteka, ki se od nje razlikuje le po velikih ?rkah v imenu.</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
@@ -1477,7 +1559,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation>
</message>
@@ -1607,21 +1689,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Ali ?elite trajno izbrisati mapo <i>%1</i> skupaj z vso vsebino mape?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Ali ?elite datoteko <i>%1</i> izbrisati trajno?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Potrdi brisanje</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1637,30 +1704,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Ni nastavljenega ra?una Nextcloud</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Ali ?elite trajno izbrisati mapo <i>%1</i> skupaj z vso vsebino mape?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Napaka overitve: uporabni?ko ime ali geslo je napa?no.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Ali ?elite datoteko <i>%1</i> izbrisati trajno?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Potrdi brisanje</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>?asovni zamik</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Podana poverila niso pravilna.</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>Nastavljen stre?nik tega odjemalca je prestar.</translation>
@@ -1670,16 +1737,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>Posodobite stre?nik in ponovno za?enite odjemalca.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Napaka overitve: uporabni?ko ime ali geslo je napa?no.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Ni nastavljenega ra?una Nextcloud</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Podana poverila niso pravilna.</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation type="unfinished"/>
</message>
@@ -1687,19 +1769,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Napaka stre?nika: odziv PROPFIND ni zapisan kot XML!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1707,27 +1789,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Pri?lo je do napake med odpiranjem mape %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Mapa v programu ni dosegljiva, ni ustreznih dovoljenj.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Mape ni mogo?e najti: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>Kodiranje imena datoteke ni veljavno</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Pri?lo je do napake med branjem mape %1</translation>
</message>
@@ -1967,11 +2049,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>Naslov URL za preverjanje se ne za?ne s HTTPS, kljub temu, da se naslov URL za prijavo je. Prijava ne bo mogo?a, ker je to lahko varnostna te?ava. Stopite v stik s skrbnikom sistema.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>Vrnjen naslov URL stre?nika se ne za?ne s HTTPS, kljub temu, da se naslov URL za prijavo je. Prijava ne bo mogo?a, ker je to lahko varnostna te?ava. Stopite v stik s skrbnikom sistema.</translation>
@@ -1983,28 +2060,33 @@
<translation>S stre?nika je prejet odziv o napaki: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>Naslov URL za preverjanje se ne za?ne s HTTPS, kljub temu, da se naslov URL za prijavo je. Prijava ne bo mogo?a, ker je to lahko varnostna te?ava. Stopite v stik s skrbnikom sistema.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Pri?lo je do napake med dostopom do kon?ne to?ke ??etona?: <br><em>%1</em>.</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Ni mogo?e raz?leniti zapisa JSON, vrnjenega s stre?nika: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>Odziv stre?nika ne vklju?uje vseh pri?akovanih polj</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Ni mogo?e raz?leniti zapisa JSON, vrnjenega s stre?nika: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2047,6 +2129,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>Datoteka %1 je odstranjena.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>Datoteka %1 je posodobljena.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>Datoteka %1 je preimenovana v %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>Datoteka %1 je premaknjena v %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2062,17 +2172,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>Datoteka %1 in ?e %n druga datoteka je bila izbrisana.</numerusform><numerusform>Datoteka %1 in ?e %n drugi datoteki sta bili izbrisani.</numerusform><numerusform>Datoteka %1 in ?e %n druge datoteke so bile izbrisane.</numerusform><numerusform>Datoteka %1 in ?e %n drugih datotek je bilo izbrisanih.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>Datoteka %1 je odstranjena.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>Datoteka %1 in ?e %n druga datoteka je bila posodobljena.</numerusform><numerusform>Datoteka %1 in ?e %n drugi datoteki sta bili posodobljeni.</numerusform><numerusform>Datoteka %1 in ?e %n druge datoteke so bile posodobljene.</numerusform><numerusform>Datoteka %1 in ?e %n drugih datotek je bilo posodobljenih.</numerusform></translation>
@@ -2088,33 +2187,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>Datoteka %1 in ?e %n druga datoteka je bila posodobljena.</numerusform><numerusform>Datoteka %1 in ?e %n drugi datoteki sta bili posodobljeni.</numerusform><numerusform>Datoteka %1 in ?e %n druge datoteke so bile posodobljene.</numerusform><numerusform>Datoteka %1 in ?e %n drugih datotek je bilo posodobljenih.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>Datoteka %1 je posodobljena.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>Datoteka %1 je bila preimenovana v %2, preimenovana je bila ?e %n druga datoteka.</numerusform><numerusform>Datoteka %1 je bila preimenovana v %2, preimenovana je bila ?e %n druga datoteka.</numerusform><numerusform>Datoteka %1 je bila preimenovana v %2, preimenovane so bile ?e %n druge datoteke.</numerusform><numerusform>Datoteka %1 je bila preimenovana v %2, preimenovanih je bilo ?e %n drugih datotek.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>Datoteka %1 je preimenovana v %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>Datoteka %1 je bila premaknjena v %2, premaknjena je bila ?e %n druga datoteka.</numerusform><numerusform>Datoteka %1 je bila premaknjena v %2, premaknjeni sta bili ?e %n drugi datoteki.</numerusform><numerusform>Datoteka %1 je bila premaknjena v %2, premaknjene so bile ?e %n druge datoteke.</numerusform><numerusform>Datoteka %1 je bila premaknjena v %2, premaknjenih je bilo ?e %n drugih datotek.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>Datoteka %1 je premaknjena v %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2151,67 +2233,67 @@
<translation>Dejavnost usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Ni mogo?e prebrati sistemske izlo?itvene datoteke</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>Dodana je nova mapa, ki presega %1 MB: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>Dodana je mapa iz zunanje shrambe.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>Med nastavitvami jo je mogo?e izbrati in ozna?iti za prejem.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>Nadaljuj z usklajevanjem</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>Zaustavi usklajevanje</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>Ali ?elite zaustaviti usklajevanje te mape?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Mapa %1 je bila ustvarjena, a je bila izlo?ena s seznama usklajevanja. Podatki v tej mapi ne bodo usklajeni.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Datoteka %1 je bila ustvarjena, a je bila izlo?ena s seznama usklajevanja. Podatki ne bodo usklajeni.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2224,41 +2306,41 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>Ali ?elite odstraniti vse datoteke?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>Obnovi datoteke s stre?nika</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>Obnovi datoteke s stre?nika</translation>
</message>
@@ -2299,11 +2381,6 @@
<translation>Ni mogo?e ponastaviti stanja mape</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>Obstaja star dnevnik usklajevanja ?%1?, ki pa ga ni mogo?e odstraniti. Preverite, ali je datoteka morda v uporabi.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(varnostna kopija)</translation>
@@ -2314,6 +2391,11 @@
<translation>(varnostna kopija %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>Obstaja star dnevnik usklajevanja ?%1?, ki pa ga ni mogo?e odstraniti. Preverite, ali je datoteka morda v uporabi.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Nedolo?eno stanje.</translation>
@@ -2384,16 +2466,6 @@
<translation>Zahteva usklajevanja je bila preklicana.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Usklajevanje je za?asno v premoru.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (usklajevanje je v premoru)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2440,6 +2512,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Usklajevanje je za?asno v premoru.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (usklajevanje je v premoru)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2483,16 +2565,6 @@
<translation>Pri?lo je do napake med nalaganjem datotek s stre?nika.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Poteka pridobivanje seznama map s stre?nika ...</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Zaznani so nerazre?eni spori. Kliknite za prikaz podrobnosti.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>Podpora za navidezne datoteke je omogo?ena.</translation>
@@ -2534,16 +2606,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>Prejmi %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>Datoteka %1 od %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Zaznani so nerazre?eni spori. Kliknite za prikaz podrobnosti.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>Prejmi %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Poteka pridobivanje seznama map s stre?nika ...</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2590,21 +2677,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 od %2, datoteka %3 od %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>Datoteka %1 od %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>Poteka pregledovanje %n mape ?</numerusform><numerusform>Poteka pregledovanje %n map ?</numerusform><numerusform>Poteka pregledovanje %n map ?</numerusform><numerusform>Poteka pregledovanje %n map ?</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>Poteka pregledovanje %n mape ?</numerusform><numerusform>Poteka pregledovanje %n map ?</numerusform><numerusform>Poteka pregledovanje %n map ?</numerusform><numerusform>Poteka pregledovanje %n map ?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2764,11 +2846,6 @@
<translation>Splo?ne nastavitve</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>Za?eni ob &zagonu sistema</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>Prika?i obvestila klicev</translation>
@@ -2779,11 +2856,6 @@
<translation>V sistemsko vrstico</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Uporabi &?rno-bele ikone</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2799,17 +2871,32 @@
<translation>Napredne mo?nosti</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Vpra?aj za potrditev pred usklajevanjem novih map ve?jih od</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Vpra?aj za potrditev pred usklajevanjem zunanjih shramb</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>Za?eni ob &zagonu sistema</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Uporabi &?rno-bele ikone</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Vpra?aj za potrditev pred usklajevanjem novih map ve?jih od</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2820,11 +2907,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Vpra?aj za potrditev pred usklajevanjem zunanjih shramb</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2876,11 +2958,6 @@
<translation>Kanal za posodobitve</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Ponovno za?eni in posodobi</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation type="unfinished"/>
@@ -2901,6 +2978,16 @@
<translation>Pravno obvestilo</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Ponovno za?eni in posodobi</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Prejeto je obvestilo stre?nika, ki zahteva pozornost.</translation>
@@ -2921,6 +3008,11 @@
<translation>Samodejnega zagona ni mogo?e izklopiti, ker je ta omogo?en sistemsko.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>stabilni</translation>
@@ -2995,6 +3087,11 @@
<source>Debug archive is created at %1</source>
<translation>Arhiv razhro??evanja je ustvarjen na %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3159,102 +3256,97 @@
<translation>Novo ime datoteke</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Preimenuj datoteko</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>Za preimenovanje te datoteke ni ustreznih dovoljenj. Datoteko lahko spremeni le avtor.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>Ime datoteke vsebuje za?etne in pripete presledne znake.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>Ime datoteke vsebuje za?etne presledne znake.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>Ime datoteke vsebuje pripete presledne znake.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>Uporabi neveljavno ime</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>V imenu datoteke so neveljavni znaki: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>Datoteke ni mogo?e preimenovati. Prepri?ajte se, da ste povezani s stre?nikom.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>Datoteke ni mogo?e preimenovati, ker datoteka z istim imenom na stre?niku ?e obstaja. Izbrati je treba drugo ime.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation type="unfinished"/>
</message>
@@ -3378,16 +3470,6 @@
<translation><p>Na voljo je nova razli?ica odjemalca %1.</p><p><b>%2</b> je na voljo za prejem. Trenutno je name??ena razli?ica %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Posodobitev tokrat presko?i</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>Pridobi posodobitve</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>Posodobitev je spodletela</translation>
@@ -3412,6 +3494,16 @@
<source>Update manually</source>
<translation>Posodobi ro?no</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Posodobitev tokrat presko?i</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>Pridobi posodobitve</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3436,6 +3528,23 @@
<translation>Posredni?ki stre?nik zahteva overitev</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Hitrost prejemanja</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Omeji na</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>kbajtov/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>Opomba: nastavitve posredni?kega stre?nika nimajo u?inka na krajevne ra?une</translation>
@@ -3458,46 +3567,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Hitrost prejemanja</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Brez omejitve</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>kbajtov/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Omeji na</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Omeji prenos na 3/4 ocenjene hitrosti</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Hitrost po?iljanja</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Samodejno omeji</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Hitrost po?iljanja</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Ime gostitelja posredni?kega stre?nika</translation>
@@ -3526,6 +3618,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>Ni mogo?e preveriti za nove posodobitve.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Poteka preverjanje stre?nika za posodabljanje ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>Na voljo je posodobitev %1</translation>
@@ -3556,11 +3658,6 @@
<translation>Posodobitve ni mogo?e prejeti. Odprite %1 za ro?ni prejem in namestitev.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>Ni mogo?e preveriti za nove posodobitve.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>Na voljo je razli?ica %1. Kliknite na <a href='%2'>%2</a> za prejem posodobitve.</translation>
@@ -3571,16 +3668,21 @@
<translation>Na voljo je nova razli?ica %1. Odprite %2 za ro?ni prejem posodobitve.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Poteka preverjanje stre?nika za posodabljanje ...</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Stanje posodobitve ni znano: ni mogo?e preveriti za nove posodobitve.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Trenutno ni novih posodobitev. Name??ena je najnovej?a razli?ica.</translation>
@@ -3756,11 +3858,6 @@
<translation><font color="green">Uspe?no je vzpostavljena povezava s stre?nikom %1: %2 razli?ica %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>Neveljaven naslov URL</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Povezava s stre?nikom %1 pri %2 je spodletela:<br/>%3</translation>
@@ -3771,6 +3868,16 @@
<translation>Povezovanje na %1 pri %2 je ?asovno poteklo.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Stre?nik ne dovoli dostopa. ?e ?elite preveriti, ali imate ustrezna dovoljenja, <a href="%1">kliknite</a> za dostop do te storitve z brskalnikom.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>Neveljaven naslov URL</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>Poteka poskus povezave z %1 na %2 ...</translation>
@@ -3781,11 +3888,6 @@
<translation>Zahteva za overitev s stre?nikom je bila preusmerjena na ?%1?. Naslov URL ni veljaven ali pa stre?nik ni ustrezno nastavljen.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Stre?nik ne dovoli dostopa. ?e ?elite preveriti, ali imate ustrezna dovoljenja, <a href="%1">kliknite</a> za dostop do te storitve z brskalnikom.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>Zaznan je neveljaven odziv za zahtevo overitve WebDAV</translation>
@@ -3997,62 +4099,34 @@
<translation>Imena datotek, ki vsebujejo kon?no piko, na tem sistemu niso podprta.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Mapa</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Datoteka</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>Ime datoteke vsebuje vsaj en neveljaven znak.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4062,6 +4136,24 @@
<translation>Datoteka vsebuje pripete presledne znake.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Mapa</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Datoteka</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4070,6 +4162,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>Ime datoteke vsebuje za?etne presledne znake.</translation>
@@ -4160,64 +4262,74 @@
<translation>Prejet je odziv stre?nika %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>Predmet je premaknjen na neveljaven cilj, vsebina bo obnovljena.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Predmet ni usklajevan, ker je na ??rnem seznamu datotek? za usklajevanje</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Dejanje ni dovoljeno! Ni ustreznih dovoljenj za dodajanje podmap v to mapo.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Dejanje ni dovoljeno, ker ni ustreznih dovoljenj za dodajanje datotek v to mapo</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Te datoteke ni dovoljeno poslati, ker ima dolo?ena dovoljenja le za branje. Datoteka bo obnovljena na izvorno razli?ico.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>Odstranjevanje ni dovoljeno, vsebina bo obnovljena.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Napaka branja podatkovne zbirke</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>Odziv stre?nika vklju?uje napako med branjem mape ?%1?: %2</translation>
</message>
@@ -4225,38 +4337,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Pri?lo je do napake posodabljanja metapodatkov: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>Datoteka je trenutno v uporabi.</translation>
</message>
@@ -4274,12 +4386,6 @@
<translation>Datoteke %1 ni mogo?e prejeti zaradi manjkajo?ih podatkov ?ifriranja!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>Datoteka je bila spremenjena po usklajevanju seznama datotek</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4336,6 +4442,12 @@
<source>The file %1 is currently in use</source>
<translation>Datoteka %1 je trenutno v uporabi.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>Datoteka je bila spremenjena po usklajevanju seznama datotek</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4353,39 +4465,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>ni mogo?e izbrisati datoteke %1, napaka: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>Ni mogo?e ustvariti mape %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Pri?lo je do napake posodabljanja metapodatkov: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>Datoteka %1 je trenutno v uporabi.</translation>
</message>
@@ -4398,14 +4510,14 @@
<translation>Predmeta ?%1? ni mogo?e odstraniti zaradi neskladja s krajevnim imenom datoteke.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4413,49 +4525,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Napaka nastavljanja pripetega staja</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Pri?lo je do napake posodabljanja metapodatkov: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>Datoteka %1 je trenutno v uporabi.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Preimenovanje datoteke je spodletelo</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4512,39 +4624,39 @@
<translation>Ni mogo?e preimenovati %1 v %2, napaka: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Pri?lo je do napake posodabljanja metapodatkov: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>Datoteka %1 je trenutno v uporabi.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>S stre?nika je vrnjen neveljaven odziv HTTP. Pri?akovan je 201, prejet pa je bil ?%1 %2?.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Napaka nastavljanja pripetega staja</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation>
</message>
@@ -4552,22 +4664,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>Po?iljanje ?ifrirane datoteke je spodletelo.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>Datoteke %1 ni mogo?e nalo?iti, saj obstaja druga, istoimenska datoteka, ki se od nje razlikuje le po velikih ?rkah v imenu.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>Po?iljanje %1 prese?e omejitev, dolo?eno za mapo.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4575,11 +4676,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Datoteka je odstranjena (za?ni po?iljanje) %1.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Krajevna datoteka je bila med usklajevanjem spremenjena. Usklajena bo, ko bo shranjena.</translation>
@@ -4609,6 +4705,22 @@
<source>The file %1 is currently in use</source>
<translation>Datoteka %1 je trenutno v uporabi.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>Po?iljanje %1 prese?e omejitev, dolo?eno za mapo.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>Po?iljanje ?ifrirane datoteke je spodletelo.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Datoteka je odstranjena (za?ni po?iljanje) %1.</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4857,6 +4969,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Vsebinski meni souporabe</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Nekaj vam dajem v souporabo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Mo?nosti souporabe</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Po?lji zasebno povezavo prek elektronske po?te ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Kopiraj zasebno povezavo v odlo?i??e</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4889,43 +5027,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Vsebinski meni souporabe</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Izbor novega mesta ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Nekaj vam dajem v souporabo</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Mo?nosti souporabe</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Dejavnosti</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Kopiraj zasebno povezavo v odlo?i??e</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Po?lji zasebno povezavo prek elektronske po?te ...</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4941,11 +5053,6 @@
<translation>Nadaljnje omogo?anje souporabe mape ni dovoljeno</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Kopiraj krajevno povezavo</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>?ifriraj</translation>
@@ -4972,12 +5079,6 @@
<translation><numerusform>Pote?e ?ez %1 minuto</numerusform><numerusform>Pote?e ?ez %1 minuti</numerusform><numerusform>Pote?e ?ez %1 minute</numerusform><numerusform>Pote?e ?ez %1 minut</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Odpri v brskalniku</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>Razre?i spor ...</translation>
@@ -5007,6 +5108,17 @@
<source>Delete</source>
<translation>Izbri?i</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Kopiraj krajevno povezavo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Odpri v brskalniku</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5108,13 +5220,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Ta povezava ni ?ifrirana in zato NI varna.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Razli?ica stre?nika: %1</translation>
@@ -5134,6 +5239,13 @@
<source>The connection is not secure</source>
<translation>Povezava s stre?nikom ni varna</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Ta povezava ni ?ifrirana in zato NI varna.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5226,6 +5338,32 @@
<translation>%1 (prenos je zadr?an zaradi predhodne napake; poskus bo ponovljen ?ez %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Na voljo je le %1, za zagon pa je zahtevanih vsaj %2</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>Ni mogo?e odpreti ali ustvariti krajevne usklajevalne podatkovne zbirke. Prepri?ajte se, da imate ustrezna dovoljenja za pisanje v usklajevani mapi.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Zmanjkuje prostora na disku: prejem predmetov, ki bi zmanj?ali prostor na disku pod %1 bo prekinjen.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>Za usklajevanje je na stre?niku premalo prostora.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Nerazre?en spor</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>Ni mogo?e posodobiti datoteke: %1</translation>
@@ -5246,22 +5384,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Nerazre?en spor</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Na voljo je le %1, za zagon pa je zahtevanih vsaj %2</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>Ni mogo?e odpreti ali ustvariti krajevne usklajevalne podatkovne zbirke. Prepri?ajte se, da imate ustrezna dovoljenja za pisanje v usklajevani mapi.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>V uporabi so navidezne datoteke s pripono, a ta ni nastavljena.</translation>
@@ -5281,16 +5403,6 @@
<source>Cannot open the sync journal</source>
<translation>Ni mogo?e odpreti dnevnika usklajevanja</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Zmanjkuje prostora na disku: prejem predmetov, ki bi zmanj?ali prostor na disku pod %1 bo prekinjen.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>Za usklajevanje je na stre?niku premalo prostora.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5301,7 +5413,7 @@
<translation>Za?asno nepovezan</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5685,11 +5797,6 @@
<source>Less than a minute</source>
<translation>Manj kot minuta</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5697,20 +5804,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5725,6 +5822,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5867,6 +5979,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>Pred nadaljevanjem je zahtevana prijava</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>Ni nastavljenih map za usklajevanje.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Prekinjena povezava z %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Nepodprta razli?ica stre?nika</translation>
@@ -5887,31 +6014,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Prekinjena povezava z %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Prekinjena je povezava z ra?uni:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Ra?un %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>Pred nadaljevanjem je zahtevana prijava</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Usklajevanje ra?una je onemogo?eno</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5933,11 +6035,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>Ni nastavljenih map za usklajevanje.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Poteka preverjanje sprememb na oddaljenem mestu ?%1?.</translation>
@@ -5948,6 +6045,21 @@
<translation>Poteka preverjanje za krajevne spremembe v ?%1?.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Prekinjena je povezava z ra?uni:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Ra?un %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Usklajevanje ra?una je onemogo?eno</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5956,11 +6068,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Krajevna mapa</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Uporabni?ko ime</translation>
@@ -5996,22 +6103,11 @@
<translation>Zahtevaj potrditev pred usklajevanjem map, ve?jih od</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Zahtevaj potrditev pred usklajevanjem zunanjih shramb</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>Izbor datotek za usklajevanje</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Ohrani krajevno shranjene podatke</translation>
@@ -6026,6 +6122,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Izbri?i krajevno mapo in za?ni s ponovnim usklajevanjem</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>Izbor datotek za usklajevanje</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Krajevna mapa</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6066,6 +6178,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>v prihodnje</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>zdaj</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Pred nekaj ?asa</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6106,57 +6263,12 @@
<source>Synced %1</source>
<translation>Usklajeno %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>v prihodnje</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>zdaj</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Pred nekaj ?asa</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6402,6 +6514,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>Odpri krajevne oziroma skupinske mape</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Odpri krajevno mapo</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Povezano</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>epovezano</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6591,16 +6746,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6615,6 +6760,16 @@
<source>%L1 KB</source>
<translation>%L1 kb</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6848,16 +7003,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>Priprava na usklajevanje</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>Priprava na usklajevanje</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Usklajevanje je v premoru</translation>
@@ -6916,4 +7071,17 @@
<translation>Sprostite krajevno shrambo</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>Omogo?i hitro usklajevanje</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_sr.ts nextcloud-desktop-3.16.6/translations/client_sr.ts
--- nextcloud-desktop-3.16.4/translations/client_sr.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_sr.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>?????? ???? ??????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>???? ?????????????? ?? ?????????????? ???? ?????? ??? ????????? ? ????????? ?????? ??????? ???? ?? ?????????. ??? ???? ???????? ?? ??????? ?????? ?????? ???????? ???????? ?????????? ?????????? ???????. ???????, ??????? ??????? ?????????? ??????? ???? ?? ?????????? ? ??????????? ??????.</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>?????? ????????? ???????</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation>??????? ??????? ?????? ? ??????</translation>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -558,7 +550,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>???? ????? ???????</translation>
</message>
@@ -573,7 +565,7 @@
<translation>????????</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>???? ????? ?? ?? ????? ?????? ?? ????????????? ???????? ????? ???????.</translation>
</message>
@@ -581,33 +573,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>??????????? ???????: ?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>?????????? ???????? ???? <b>????????</b> ?? ???????? ????-??????? ? ???? ?? ???? ?????????????? ?? ???? ????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>????????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>???????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>??????? ?? <server> ??? <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>??????????? ???</translation>
@@ -638,6 +608,33 @@
<translation>?????????? ????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>??????????? ???????: ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>??????? ?? <server> ??? <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>???? ??????? ?????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>????????? ??-?????-??-????? ?? ?????????? ?????????</translation>
@@ -672,9 +669,9 @@
<b>?????? ?? ???? ?? ?? ???????. ?? ?? ??? ??????? ?? ?????? ?? ??????????</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>???? ??????? ?????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation>???????? ?????????? ????????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -687,6 +684,11 @@
<translation>??????? ?????????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation>????????? ?? ????????. ?? ?????????? ?? <b>?????????</b> ?????? ?? ?? ?? ????????? ?-?????-??-???? ??? ???? ??????? ???? ?? ? ???? ??????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>?? ???? ????? ?? ???????? ????????? ??-?????-??-?????</translation>
@@ -712,6 +714,13 @@
<translation>???? ?????? ??? ?????? ??????????????. ????????? ?? ???? ?????? ??? ???? ?? ??????? ????????????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation>???? ?????? ?? ?????? ?? ????????? ??? ?? ??????? ???? ???????? ????????? ?-?????-??-????.
+?????? ?? ???? ?? ?? ?????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -736,12 +745,6 @@
<translation>?????? ???? ????? ?? ?? ??????? ??? ???? ?? ???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>?????? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>??????</translation>
@@ -780,16 +783,6 @@
<translation>?????? ??????? ??????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>??????? ??????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>???????? ??????????????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>?????? ???? ?? ?????????????? ????????</translation>
@@ -815,21 +808,11 @@
<translation>???????? ???????? ???? ??????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>?? ???? ?? ???????? ??????? ???????? <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>????????? ???????? ????????? ?? ?????????????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>?????? ?? ?????? ?? ?????????? ?? ??????????????? ???????? <i>%1</i>?</p><p><b>????????:</b> ??? <b>????</b> ???????? ??????? ????.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>?????? ???? ?? ?????????????? ????????</translation>
@@ -863,24 +846,24 @@
<translation>????????? ????????? ??-?????-??-?????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>?? ????? ????????? ??? ????????????? ?????????, ????????? ??? ?? ?? ??????????? ?? 12 ???? ?? ???????. ?????? ??? ?? ?? ?????????? ? ?? ?? ?????? ?? ????????. ???? ??? ???????? ?? ?????? ?????? ??????? ?? ???? ????? (??? ??? ?? ??? ??????? ??????? ??? ??????).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation>?? ????? ????????? ??? ????????????? ?????????, ????????? ??? ?? ?? ??????????? ?? 12 ???? ?? ???????. ?????? ??? ?? ?? ?????????? ? ?? ?? ?????? ?? ????????. ???? ??? ???????? ?? ???????? ?????????????? ?????????? ??????? ?? ????? ??????? ?????????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>??????? ????????? ??-?????-??-?????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation>???????? ????????? ?? ???????-??-????? ?? ???? ???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>?? ???????? ????????? ??-?????-??-????? ?? %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation>?????? ?? ?? ?? ???????? ?????????? ????????? ?? ???????-??-????? ?? %1 ?? ???? ????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>???????? ????????? ??-?????-??-????? ?? ?? ?????? ??????? ?????????????? ????????? ???????.<br>????????? ??????? ?? ?????? ?? ???????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation>??????????? ????????? ?? ???????-??-????? ?? ???????? ???????? ??????? ? ??? ????????? ??????? ?? ???? ???????.<br>???????, ????????? ??????? ?? ?????? ?? ??????? ? ???? ????? ?????? ????????? ???? ?? ????????.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -893,34 +876,44 @@
<translation>?????????????? ?? ? ????.<br/>?????? ?? ?? ?? ??????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) ?? %2 ???????????. ???? ????????, ?????????? ?????? ????????? ??? ?????? ????????, ???? ????? ????? ??????????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 ???????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 ?? %2 ???????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>???????? ?????????? ?? ????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>???????? ???? ????????? ???????? ? ??????? ?????????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>??? ??????? ???? ?? ???????? ??????? ????? %1MB: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 ???????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation>????????? ?? ???????-??-????? ?? ??????????????? ?? ???? ?????? ?? ?????? ????????.<br>??????? ??????????? ????????? ?? ?? ?? ????????? ??????? ?????????????? ? ?? ???? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 ??? %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>????????? ??-?????-??-????? ?? ???? ????? ?? ???????? ?? ?????? ???????.<br>???? ?? ?? ?????? ?? ???? ??????? ???????? ????? ??????????.<br>??? ?? ???????? ?????????????? ?????????? ?????????? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>??????? ??????? %1 ???? ????????! ?????????? ?? ????????? ?????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation>???? ????? ???????? ????????? ?? ?????-??-????, ??? ???? ???? ?? ? ??????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>?????? ?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>???? ????? ???????? ????????? ?? ????? ?? ????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -938,79 +931,125 @@
<translation>?????? %1 ?? ???????? ? ?????? ?????????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>?????? %1 ?? ???????? ???????????, ??? ?? ???? ???? ??? ??????? ???? ??????? ?????????.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>???????? ?? %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>????????? ?? ?? %1 ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>??? ?? ???????? ???? ???? ?????????????? ??? ?? ?????????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>???? ?????? ?????????? ?? %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>??? ?? ???????? ???? ???? ?????????????? ???? ??? ?? ?? ??????? ???????????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>?????? ? ????????????? ???????: %1 ? %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>??? ?? ???????? ???? ???? ?????????????? ???? ??? ?? ????????? ??? ?? ?? ??????? ???????????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>?????? ?????????? ?????? ????????? ????????? ? %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>?????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>???? ???????? %1 ????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>??????? ??????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>???????? ?????????? ?? ????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>???????? ??????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>??? ?? ???????? ???? ???? ?????????????? ??? ?? ?????????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>?? ???? ?? ???????? ??????? ???????? <i>%1</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>??? ?? ???????? ???? ???? ?????????????? ???? ??? ?? ?? ??????? ???????????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>?????? ?? ?????? ?? ?????????? ?? ??????????????? ???????? <i>%1</i>?</p><p><b>????????:</b> ??? <b>????</b> ???????? ??????? ????.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>??? ?? ???????? ???? ???? ?????????????? ???? ??? ?? ????????? ??? ?? ?? ??????? ???????????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>?? ????? ????????? ??? ????????????? ?????????, ????????? ??? ?? ?? ??????????? ?? 12 ???? ?? ???????. ?????? ??? ?? ?? ?????????? ? ?? ?? ?????? ?? ????????. ???? ??? ???????? ?? ?????? ?????? ??????? ?? ???? ????? (??? ??? ?? ??? ??????? ??????? ??? ??????).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>??? ??????? ???? ?? ???????? ??????? ????? %1MB: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>??????? ????????? ??-?????-??-?????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>????????? ??-?????-??-????? ?? ???? ????? ?? ???????? ?? ?????? ???????.<br>???? ?? ?? ?????? ?? ???? ??????? ???????? ????? ??????????.<br>??? ?? ???????? ?????????????? ?????????? ?????????? ???????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>?? ???????? ????????? ??-?????-??-????? ?? %1?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>???? ????? ???????? ????????? ?? ????? ?? ????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>???????? ????????? ??-?????-??-????? ?? ?? ?????? ??????? ?????????????? ????????? ???????.<br>????????? ??????? ?? ?????? ?? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>?????? ?????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) ?? %2 ???????????. ???? ????????, ?????????? ?????? ????????? ??? ?????? ????????, ???? ????? ????? ??????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 ?? %2 ???????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>???????? ???? ????????? ???????? ? ??????? ?????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 ??? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>??????? ??????? %1 ???? ????????! ?????????? ?? ????????? ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>?????? %1 ?? ???????? ???????????, ??? ?? ???? ???? ??? ??????? ???? ??????? ?????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>????????? ?? ?? %1 ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>???? ?????? ?????????? ?? %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>?????? ? ????????????? ???????: %1 ? %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>?????? ?????????? ?????? ????????? ????????? ? %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>???? ???????? %1 ????.</translation>
</message>
</context>
<context>
@@ -1125,11 +1164,6 @@
<translation>?????????? ? ???? (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>??????????</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>??????? ???????????:</translation>
@@ -1140,6 +1174,11 @@
<translation>?????? ?? ??????????? ????????? pkcs12 ????? ??? ?? ?? ?????? ???????? ? ??????????????? ?????.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>??????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>????????? ??????????</translation>
@@ -1190,34 +1229,34 @@
<translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 ??????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 ?????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 ???????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 ??????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>???? ????? ???????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1225,12 +1264,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>?????? ??? ?????????? ????? ?? ????????????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>????? ?? ?? ?????? ???????? ???????? ??????????????? ????? ? %1. ?????? ??? ?? ?????????? ?? ??? ????????? ????? ??? ??????? ?????.</translation>
</message>
@@ -1272,6 +1311,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation>???? ?? ??????? ????? ?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation>?? ???? ?? ?? ?????? ???? ????? %1 ?? ??????? ????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation>???? %1 ?? ???? ?? ?? ??????? ??? ???? ?????????!</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation>???? %1 ?? ???? ?? ?? ??????? ?? ??????? ????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation>???? %1 ?? ???? ?? ?? ??????? ??? ????????? ?????? ? ?????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation>?????? ???????? ????????? ????????????: %1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation>???? %1 ?? ???????? ???????</translation>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1279,6 +1357,11 @@
<translation>???? %1 ?? ???? ?? ?? ??????? ??? ??????? ???? ?? ????? ?????? ??? ?????????? ????????? ?????</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation>???? ?????? ??????? ?? ??????? ??? ?? ????? ? ?? ???? ?? ?? ?? ??????? ???.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>???? %1 ??? ?????????? ????? ??????. ?? ?????????? ?? ?? ??????.</translation>
@@ -1483,7 +1566,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>?????? ???????? ????????? ???????????? ? ????</translation>
</message>
@@ -1613,21 +1696,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>?? ?? ?????????? ?????? ?? ???????? ???????????? <i>%1</i> ? ??? ????? ????????</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>?? ?? ?????????? ?????? ?? ???????? ???? <i>%1</i>?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>??????? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1643,30 +1711,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>???? ????????? ?????????? ??????</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>?? ?? ?????????? ?????? ?? ???????? ???????????? <i>%1</i> ? ??? ????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>?????? ???????????????: ??????? ??? ?????????? ??? ?? ????????.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>?? ?? ?????????? ?????? ?? ???????? ???? <i>%1</i>?</translation>
</message>
<message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>??????? ???????</translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
+ <message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>???? ?????????? ???? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>???????? ?????? ?? ?????? ???? ?? ??? ??????? ????????</translation>
@@ -1676,16 +1744,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>?????????? ?????? ? ?????? ????????? ????????.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>?????? ???????????????: ??????? ??? ?????????? ??? ?? ????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>???? ????????? ?????????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>???? ?????????? ???? ????????</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>?????? ???????? ?????????? ??????? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>?????? ???????? ?????????? ?????? %1</translation>
</message>
@@ -1693,19 +1776,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>????????? ??????: PROPFIND ??????? ???? XML ??????????!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>?????? ?????????? ?????????? ????????????!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>?????? ? ?????????? ?????????? ????????????: ??????? ?????? ?? ??????? ?? ??????.</translation>
</message>
@@ -1713,27 +1796,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>?????? ???????? ???????? ????????????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>????????????? ?? ???? ?? ?? ???????? ?? ????????, ???? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>???? ???????? ????????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>???????? ????? ????? ???? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>?????? ???????? ?????? ????????????? %1</translation>
</message>
@@ -1973,11 +2056,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>URL ?? ?????????? ?? ?????? ?? HTTPS ???? ?? URL ?? ??????? ????? ?? HTTPS. ??????? ???? ???? ?????? ??? ????? ??????? ??????????? ???????. ?????? ??? ?? ?? ???????? ???? ??????????????.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>??????? URL ??????? ?? ?????? ?? HTTPS ?????? ???? ??? ?? URL ?? ??????? ????? ?? HTTPS. ??????? ???? ???? ?????? ??? ????? ??????? ??????????? ???????. ?????? ??? ?? ?? ???????? ???? ??????????????.</translation>
@@ -1989,28 +2067,33 @@
<translation>?????? ??????? ?? ???????: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>URL ?? ?????????? ?? ?????? ?? HTTPS ???? ?? URL ?? ??????? ????? ?? HTTPS. ??????? ???? ???? ?????? ??? ????? ??????? ??????????? ???????. ?????? ??? ?? ?? ???????? ???? ??????????????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>????? ?? ?? ?????? ???????? ???????? ?token? ?????????? ?????: <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>?? ???? ?? ???????? JSON ?????? ?? ???????: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>??????? ?? ??????? ???? ??????? ??? ????????? ????</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation>??????? ?? ??????? ???? ??????? ??? ????????? ????: <br><em>%1</em></translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>?? ???? ?? ???????? JSON ?????? ?? ???????: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2053,6 +2136,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ?? ???????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ?? ????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 ?? ??????????? ? %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 ?? ????????? ? %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation><numerusform>%1 and %n ????? ???? ?? ????????.</numerusform><numerusform>%1 and %n ?????? ??????? ?? ????????.</numerusform><numerusform>%1 and %n ?????? ??????? ?? ????????.</numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>?????? ??? ?? ????????? ???? ????? ????????. ?????? %1 ?? ???????.</translation>
@@ -2068,17 +2179,6 @@
<translation>?????? ??? ?? ????????? ???? ????? ????????. %1 ???? ?????? ???? ???? ?? ?? ????.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 ? ??? %n ????? ???? ?? ???????.</numerusform><numerusform>%1 ? ??? %n ????? ????? ?? ????????.</numerusform><numerusform>%1 ? ??? %n ?????? ??????? ?? ????????.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ?? ???????.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>????? ?? %1 ??? %n ????? ????.</numerusform><numerusform>????? ?? %1 ??? %n ????? ?????.</numerusform><numerusform>????? ?? %1 ??? %n ?????? ???????.</numerusform></translation>
@@ -2094,33 +2194,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 ? ??? %n ????? ???? ?? ????????.</numerusform><numerusform>%1 ? ??? %n ????? ????? ?? ?????????.</numerusform><numerusform>%1 ? ??? %n ?????? ??????? ?? ?????????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ?? ????????.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ?? ??????????? ? %2, ? ??? %n ???? ?? ?????? ???????????.</numerusform><numerusform>%1 ?? ??????????? ? %2, ? ??? %n ????? ?? ?????? ????????????.</numerusform><numerusform>%1 ?? ??????????? ? %2, ? ??? %n ??????? ?? ?????? ????????????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 ?? ??????????? ? %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 ?? ??????? ? %2, ? ??? %n ???? ?? ?????? ???????.</numerusform><numerusform>%1 ?? ??????? ? %2, ? ??? %n ????? ?? ?????? ????????.</numerusform><numerusform>%1 ?? ??????? ? %2, ? ??? %n ??????? ?? ?????? ????????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 ?? ????????? ? %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2157,68 +2240,68 @@
<translation>????????? ??????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>?? ???? ?? ???????? ????????? ?????? ?? ??????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>?????? ?? ???? ???????? ???? ?? %1 MB: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>?????? ?? ???????? ?? ??????? ?????????.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>????? ? ???????? ? ???????? ??? ?????? ?? ?? ?????????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>?????? ?? ?????? ?????????? ?????????? ???????? ?? %1MB: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>??????? ??????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>???????? ??????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>?????? %1 ?? ?????? ?????????? ?????????? ???????? ?? %2MB.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>?????? ?? ?? ?????????? ?????????????? ???? ????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>???????? %1 ?? ????????, ??? ?? ??? ?????? ????????? ?? ??????????????. ?????? ?????? ?? ???? ???? ??????????????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>???? %1 ?? ???????, ??? ?? ??? ?????? ???????? ?? ??????????????. ???? ???? ?????????????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2231,12 +2314,12 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>???? ?????? ????????? ?????????? ?????, ??? ?%1?, ?????? ?%2? ? ?????? ? ?????? ?%3~</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2245,7 +2328,7 @@
? ?????????, ??? ???????? ??????? ?????? ?? ???????? ???? ??? ?? ????????? ?? ??????? ?%1? ?? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2254,22 +2337,22 @@
? ?????????, ??? ???????? ??????? ?????? ?? ???????? ???? ??? ?? ?????? ????????? ?? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>?????? ?? ?? ???????? ??? ????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>??????? ?? ????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>????? ??????? ?? ??????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>????? ??????? ?? ???????</translation>
</message>
@@ -2310,11 +2393,6 @@
<translation>?? ???? ?? ????????? ????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>???????? ?? ????? ?????? ?????????????? ?%1?, ??? ?? ???? ?? ?? ??????. ?????? ??? ?? ?????????? ?? ?? ???????? ?? ??????? ??????? ??????????.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation> (???????)</translation>
@@ -2325,6 +2403,11 @@
<translation> (??????? %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>???????? ?? ????? ?????? ?????????????? ?%1?, ??? ?? ???? ?? ?? ??????. ?????? ??? ?? ?????????? ?? ?? ???????? ?? ??????? ??????? ??????????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>???????????? ?????.</translation>
@@ -2395,16 +2478,6 @@
<translation>?????? ?? ????????????? ?? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>?????????????? ?? ?????????.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (?????????????? ?????????)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>?????? ??? ?? ????????? ???? ????? ????????. ???????? ?????? ???? ????????.</translation>
@@ -2454,6 +2527,16 @@
??? ?????? ?? ?????? ???????: ?????? ??? ?? %1 ???????? ?? ????? ? ?? ?????? ? ???????? ???? ?????? ?? ??????????????.
?? ???????? ?????????: ??????? ???? ?? ???? ? ???? ?? ???? ???? ???????? ?????????????? ???? ?? ?????? ? ?????? ???????. ?????? ??? ?? ????????? ?? ?? ?? ? %1 ?????? ????????? ? ??????????? .sync_*.db ??????? ? ???????? ??.</translation>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>?????????????? ?? ?????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (?????????????? ?????????)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2497,16 +2580,6 @@
<translation>?????? ??? ????????? ????? ???????? ?? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>???????? ?????? ???????? ?? ????????</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>??????? ??????????? ?????????. ???????? ?? ??????.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>???????? ?? ??????? ?? ????????? ????.</translation>
@@ -2548,16 +2621,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>?????????? %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>???? %1 ?? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>??????? ??????????? ?????????. ???????? ?? ??????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>?????????? %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>???????? ?????? ???????? ?? ????????</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2604,21 +2692,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 ?? %2, ???? %3 ?? %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>???? %1 ?? %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>????? ?? ????????? %n ?????????</numerusform><numerusform>????? ?? ????????? %n ?????????</numerusform><numerusform>????? ?? ?????????? %n ?????????</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>?????????????? ?? ?????? ?? ?????</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>????? ?? ????????? %n ?????????</numerusform><numerusform>????? ?? ????????? %n ?????????</numerusform><numerusform>????? ?? ?????????? %n ?????????</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2778,11 +2861,6 @@
<translation>????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>??????? ??? ????????? &???????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>??????? ?????????? ? ??????</translation>
@@ -2793,11 +2871,6 @@
<translation>?? ????????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>??????? &?????????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>??????? ?????????? ? ????</translation>
@@ -2813,17 +2886,32 @@
<translation>????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>????? ?? ??????? ??? ?????????????? ????? ??????? ????? ??</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>????? ?? ??????? ??? ?????????????? ????????? ?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>??????? ??? ????????? &???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>??????? &?????????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>????? ?? ??????? ??? ?????????????? ????? ??????? ????? ??</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>???????? ???? ???????? ??????????????? ??????? ????? ?????? ???????</translation>
@@ -2834,11 +2922,6 @@
<translation>?????????? ??????? ?????????????? ??????? ???? ???????? ????? ???????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>????? ?? ??????? ??? ?????????????? ????????? ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>???????? ???????? ??????? ? ?????</translation>
@@ -2890,11 +2973,6 @@
<translation>????? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&?????? ??????? ? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>&?????????? ?????????? ????????? ?????????</translation>
@@ -2915,6 +2993,16 @@
<translation>?????? ??????????</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation>????? ?? &?????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&?????? ??????? ? ????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>?????????? ?? ??????? ???? ????????? ?????.</translation>
@@ -2935,6 +3023,11 @@
<translation>?? ?????? ?? ????????? ????????? ??? ?? ??????? ????????? ?? ????? ???????.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation>????? ?? &%1</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>????????</translation>
@@ -3016,6 +3109,11 @@
<source>Debug archive is created at %1</source>
<translation>????? ?????? ?? ???????? ? %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation>??? ?????? ??????? ??????????? ???? ?? ???????? ?? ????????! ????? ?????? ?? ???????? ?? %1</translation>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3180,102 +3278,97 @@
<translation>???? ??? ?????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>??????? ??? ?????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>???? ?%1? ?? ???? ?? ?? ???????????? ??? ??? ?????? ????????? ???? ???? ????????? ?? ???? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>?? ??????? ???? ???????? ??????? ?????????: * " | & ? , ; : \ / ~ < > ??????? ?? ???????/????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
- <translation type="unfinished"/>
+ <translation>?? ??????? ???? ????????? ??????? ?????????: \ / : ? * " < > | ??????? ?? ???????/?????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>???? ?%1? ?? ???? ?? ?? ???????????? ??? ? ????? ?????? ????????? ???? ???? ????????? ?? ???? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>???? ????????? ??????? ?????????: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>???? ????????? ??????? ????? ?????: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>???? ????????? ??????? ????? ???????: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>???? ????????? ??????? ?????????? ???????: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>??????? ??????? ?? ??????? ?????...</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>?????? ??????? ?? ??????? ????? ???? ?????. ?????? ??? ?? ????????? ?? ?????? ?? ?? ??????? ???.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>?????????? ?????? ???? ?????? ????? ?????? %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>??? ????? ?????? ??????? ?? ??????? ? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>??? ????? ?????? ??????? ?? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>??? ????? ?????? ??????? ?? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>???????? ??????????? ?????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>??? ????? ?????? ?????????? ?????????: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>?? ???? ?? ?? ??????? ??? ?????. ?????? ??? ?????????? ???? ?? ????????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>?? ???? ?? ?? ??????? ??? ????? ??? ?? ??????? ??? ??????? ???? ?? ??? ??????. ?????? ??? ?? ????????? ???? ????? ???.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>?? ???? ?? ?? ??????? ??? ???????? ?????. %1</translation>
</message>
@@ -3399,16 +3492,6 @@
<translation><p>???? ??????? %1 ???????? ?? ????????.</p><p><b>%2</b> ?? ???????? ?? ??????????. ??????????? ?? %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>???????? ????</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>????????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>???? ?????? ?????????</translation>
@@ -3433,6 +3516,16 @@
<source>Update manually</source>
<translation>???????? ?????</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>???????? ????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>????????</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3457,6 +3550,23 @@
<translation>?????? ??????? ???????????????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>?????? ??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>???????? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KB/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>????????: ?????? ?????????? ?????? ?????? ?? ?????? ?? ???????? ?????</translation>
@@ -3479,46 +3589,29 @@
<translation>??????? ????? ??????????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>?????? ??????????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>??? ??????????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KB/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>???????? ??</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>???????? ?? 3/4 ????????? ?????? ???????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>?????? ?????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>??? ????????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>?????? ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>????? ?????? ???????</translation>
@@ -3547,6 +3640,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>?? ???? ?? ???????? ???? ?????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>?????????? ?????? ??????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>??????? ?? ???? ????????? ?? %1 </translation>
@@ -3577,11 +3680,6 @@
<translation>???? ????? ?? ?? ??????? ?????????. ?????? ??? ?? ???????? %1 ? ????? ????????? ?????????.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>?? ???? ?? ???????? ???? ?????????.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>???? ??????? %1 ?? ????????. ?????? ??? ?? ???????? <a href='%2'>%2</a> ? ????????? ?????????.</translation>
@@ -3592,16 +3690,21 @@
<translation>???? ??????? %1 ?? ????????. ?????? ??? ?? ???????? %2 ? ????????? ?????????.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>?????????? ?????? ??????????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>????? ????????? ?? ?????????. ????? ???????? ???? ?????????.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation>????????? %1 ????? ?????????. ???? ??????????? ?? ????????? ???????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation>???? ????????? ?????????. ????? ???????? ???????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>???? ????????? ?????????. ????? ???????? ???????.</translation>
@@ -3777,11 +3880,6 @@
<translation><font color="green">??????? ??????? ?? %1: %2 ??????? %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>?????????? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>????????? ?????????? ?? %1 ?? %2:<br/>%3</translation>
@@ -3792,6 +3890,16 @@
<translation>????? ?? ??????? ? ???????? ?????????? ?? %1 ?? %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>?????? ???? ???????? ???????. ?? ????????? ????? ?? ???????? ???????, <a href="%1">???????? ????</a> ?? ????? ?????????? ?????? ?? ??????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>?????????? ??????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>????????? ?? ?? ??????? ?? %1 ?? %2?</translation>
@@ -3802,11 +3910,6 @@
<translation>??????????????? ?????? ??????? ?? ?????????? ?? ?%1?. URL ?? ??????????, ?????? ?? ???????? ????????????.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>?????? ???? ???????? ???????. ?? ????????? ????? ?? ???????? ???????, <a href="%1">???????? ????</a> ?? ????? ?????????? ?????? ?? ??????????.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>??????? ?? ?????????? ??????? ?? ??????????????? WebDAV ??????</translation>
@@ -4018,64 +4121,36 @@
<translation>????? ??????? ???? ?? ?????????? ?? ?????? ???? ???????? ?? ???? ???? ???????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>??????</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>????</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
- <translation type="unfinished"/>
+ <translation>????? ??????? ???? ?????? ???????? ?%1? ???? ???????? ?? ???? ???? ???????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>??? ?%1? ???? ?????? ???????? ?%2? ?? ?? ???????? ?? ???? ???? ???????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>??? %1 ?????? ??? ????? ??????????? ????????</translation>
+ <translation>????? ??????? ???? ?????? ???????? ?%1? ???? ???????? ?? ???? ???? ???????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>??? %1 ?? ??????????? ??? ?? ???? ???? ???????.</translation>
+ <translation>??? ??????? ?????? ??? ????? ?????????? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>??? ????? ?????? ??? ????? ?????????? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
+ <translation>??? ??????? ?? ??????????? ??? ?? ???? ???? ???????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
+ <translation>??? ????? ?? ??????????? ??? ?? ???? ???? ???????.</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="433"/>
@@ -4083,6 +4158,24 @@
<translation>??? ????? ?????? ??????? ?? ?????.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>??? ?%1? ???? ?????? ???????? ?%2? ?? ?? ???????? ?? ???? ???? ???????.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4091,6 +4184,16 @@
<translation>?? ???? ?? ?? ??????? ??? ??? ???????.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>??? %1 ?????? ??? ????? ??????????? ????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>??? %1 ?? ??????????? ??? ?? ???? ???? ???????.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>??? ????? ?????? ??????? ?? ???????.</translation>
@@ -4181,64 +4284,74 @@
<translation>?????? ?? ???????? ?? ???? %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>?? ???? ?? ?? ???????????? ???? ??????????? ??????? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation>????????? %1 ????????? %2 ???????? ?????????? ? ?????? ?????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation>????????? %1 ????????? %2 ???????? ?????????? ? ??????? %3.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>???? ?? ???? ?? ?? ??????? ??? ?? ??????? ? ?%1?.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>?????? ???????? ??????? ???? ?????? %1 ?? ???? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>?????????? ?? ?????????? ???, ????? ??</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>????????? ?????? ?? ???? ?? ?? ?????? ??? ???????? ?????????? ???? ????????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>?????????? ??? ?? ?? ?????? ?? ????? ?? ??????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>???? ????????? ????? ?????? ??????? ?? ?????? ?????????? ? ???? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>???? ????????? ????? ?????? ??????? ?? ?????? ??????? ? ???? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>???? ????????? ?? ????????? ???? ???? ??? ?? ?? ??????? ??????? ??? ????-??-??????. ????? ??</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>???? ????????? ???????, ????? ??</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>?????? ???????? ?????? ???? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>?????? ?? ????????? ?? ??????? ????? ?????? ????????????? ?%1? : %2</translation>
</message>
@@ -4246,38 +4359,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>???? %1 ?? ???? ?? ?? ?????? ?? ??????? ????</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>?????? ???????? ????????? ???????????? ????? ??????????? ??????? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>?????? %1 ?? ???? ?? ?? ???? ????-??-??????: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>????????? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>?????? ???????? ????????? ????????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>???? ?? ???????? ???????</translation>
</message>
@@ -4295,12 +4408,6 @@
<translation>???? %1 ?? ???? ?? ?? ??????? ??? ????????? ?????? ? ?????????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>???? ?? ??????? ? ???????????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4357,6 +4464,12 @@
<source>The file %1 is currently in use</source>
<translation>???? %1 ?? ???????? ???????</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>???? ?? ??????? ? ???????????</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4374,39 +4487,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>?? ???? ?? ??????? ???? %1, ??????: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>?????? %1 ?? ???? ?? ?? ?????? ???? ?????? ?? ??????? ???????? ????? ??? ???????!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>?? ???? ?? ?? ?????? ?????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>?????? %1 ?? ???? ?? ?? ???? ????-??-??????: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>????????? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>?????? ???????? ????????? ????????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>???? %1 ?? ???????? ???????</translation>
</message>
@@ -4419,14 +4532,14 @@
<translation>?? ???? ?? ??????? %1 ???? ???????? ?? ??????? ???????? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation>?????????? ?????? ???????? ???????? ??????? ?????? ???? ?? ???????? ?? ???????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>?? ???? ?? ?? ?????? ???? ????? %1 ?? ??????? ????</translation>
</message>
@@ -4434,49 +4547,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>??????? %1 ?? ???? ?? ?? ??????? ??? ???? ?????? ?? ??????? ???????? ????? ??? ???????!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>???? %1 ?? ???????, ??? ?? ??????? ????? ?? ??????? ???????? ?????!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>???? %1 ?? ???? ?? ?? ??????? ?? ??????? ????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>?????? ???????? ?????????? ????? ????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>?????? ???????? ????????? ????????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>???? %1 ?? ???????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>???? ?????? ??????????? ??????? ????? ????????????? ? ???????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>???? ?????? ??????? ????? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>?? ???? ?? ?? ?????? ???? ????? %1 ?? ??????? ????</translation>
</message>
@@ -4533,39 +4646,39 @@
<translation>??? %1 ?? ???? ?? ?? ??????? ? %2, ??????: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>?????? ???????? ????????? ????????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>???? %1 ?? ???????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>?????? ?? ?????? ???????? HTTP ???. ???????? ?? 201, ? ??????? ?? ?%1 %2?.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>???? %1 ?? ???? ?? ?? ??????? ?? ??????? ????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>?? ???? ?? ?? ?????? ???? ????? %1 ?? ??????? ????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>?????? ???????? ?????????? ????? ????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>?????? ??? ????? ???? ???????? ? ????</translation>
</message>
@@ -4573,22 +4686,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>???? ?????? ????????? ?????????? ?????.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>???? %1 ?? ?? ???? ????????? ??? ??????? ????? ????, ???? ?? ??? ????????? ???? ? ??????? ? ????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>????????? %1 ????????? ????? ????????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4596,11 +4698,6 @@
<translation>???? %1 ??? ?????????? ????? ??????. ?? ?????????? ?? ?? ??????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>???? ??????? (???????? ?????????) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>??????? ???? ?? ??????? ????? ??????????????. ???? ??????????.</translation>
@@ -4630,6 +4727,22 @@
<source>The file %1 is currently in use</source>
<translation>???? %1 ?? ???????? ???????</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>????????? %1 ????????? ????? ????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>???? ?????? ????????? ?????????? ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>???? ??????? (???????? ?????????) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4878,6 +4991,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>?????????? ???? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>??????? ??? ????? ?? ????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>?????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>?????? ???????? ???? ?-???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>??????? ???????? ???? ? ??????</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>???? ?????? ????????? ??????? ? ?%1?</translation>
@@ -4912,43 +5051,17 @@
<translation>??????? ?????? ?? ??????? ????????: "%1?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>?????????? ???? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>????????? ???? ???????? ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>??????? ??? ????? ?? ????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>?????? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>?????????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>??????? ???????? ???? ? ??????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>?????? ???????? ???? ?-???????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>??????? ??? ??????</translation>
@@ -4964,11 +5077,6 @@
<translation>??????? ?????? ???? ??????? ???? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>??????? ??????? ????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>??????</translation>
@@ -4995,12 +5103,6 @@
<translation><numerusform>?????? ?? %1 ?????</numerusform><numerusform>?????? ?? %1 ??????</numerusform><numerusform>?????? ?? %1 ??????</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>?????? ? ??? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>??????? ???????? ...</translation>
@@ -5030,6 +5132,17 @@
<source>Delete</source>
<translation>???????</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>??????? ??????? ????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>?????? ? ??? ??????</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5131,13 +5244,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>??? ???? ???? ???????? ??? ???? ?????????.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>??????? ???????: %1</translation>
@@ -5157,6 +5263,13 @@
<source>The connection is not secure</source>
<translation>???? ???? ????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>??? ???? ???? ???????? ??? ???? ?????????.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5249,6 +5362,32 @@
<translation>%1 (?????????? ???? ?????? ??????, ????????? ?????? ?? %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>???????? ?? ???? %1, ????? ??? %2 ?? ??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>?? ???? ?? ??????? ??? ??????? ??????? ???? ?? ??????????????. ?????????? ?? ?? ????? ????? ?????? ? ???????????????? ????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>???? ???????? ?? ?????: ?????????? ???? ?? ??????? ???????? ????? ????? %1 ?? ??????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>???? ??????? ????? ?? ??????? ?? ???? ?????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>??????????? ????????.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>???? ?? ???? ?? ?? ???????: %1</translation>
@@ -5269,22 +5408,6 @@
<translation>?? ???? ?? ?? ??????? ???? ????? ? ??????? ????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>??????????? ????????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>???????? ?? ???? %1, ????? ??? %2 ?? ??????????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>?? ???? ?? ??????? ??? ??????? ??????? ???? ?? ??????????????. ?????????? ?? ?? ????? ????? ?????? ? ???????????????? ????????.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>??????? ?? ???????? ??????? ?? ????????, ??? ?? ???? ?????????</translation>
@@ -5304,16 +5427,6 @@
<source>Cannot open the sync journal</source>
<translation>?? ???? ?? ??????? ?????? ??????????????</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>???? ???????? ?? ?????: ?????????? ???? ?? ??????? ???????? ????? ????? %1 ?? ??????????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>???? ??????? ????? ?? ??????? ?? ???? ?????????.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5324,7 +5437,7 @@
<translation>??? ?????</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>?????? ?????????? ?????? ?????????</translation>
</message>
@@ -5708,11 +5821,6 @@
<source>Less than a minute</source>
<translation>???? ?? ??????</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5720,20 +5828,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1 ?????</numerusform><numerusform>%1 ??????</numerusform><numerusform>%1 ??????</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1 ???</numerusform><numerusform>%1 ????</numerusform><numerusform>%1 ????</numerusform></translation>
@@ -5748,6 +5846,21 @@
<source>%1 days</source>
<translation><numerusform>%1 ???</numerusform><numerusform>%1 ????</numerusform><numerusform>%1????</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation><numerusform>%n ?????</numerusform><numerusform>%n ??????</numerusform><numerusform>%n ??????</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n ???</numerusform><numerusform>%n ????</numerusform><numerusform>%n ????</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n ???</numerusform><numerusform>%n ????</numerusform><numerusform>%n ????</numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5890,6 +6003,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>????????? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>???? ????????? ???????? ?? ??????????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>???????? ?? %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>?????????? ??????? ???????</translation>
@@ -5910,31 +6038,6 @@
<translation>??? ????? %1 ??????? ?? ?????????? ?????? ????????? ???????. ?????? ??????????? ?? %2 ?? ????????? ?? ??? ?? ????????? ? ?? ?? ??????? ?? ????.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>???????? ?? %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>???????? ?? ??????:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>????? %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>????????? ??</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>?????????????? ?????? ?? ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5956,11 +6059,6 @@
<translation>macOS VFS ?? %1: ????? ?? ?? ????????.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>???? ????????? ???????? ?? ??????????????.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>??????? ??? ?? ??????? ? ???????? ?%1?</translation>
@@ -5971,6 +6069,21 @@
<translation>??????? ??? ?? ??????? ? ???????? ?%1?</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>???????? ?? ??????:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>????? %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>?????????????? ?????? ?? ?????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5979,11 +6092,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&??????? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>?????????? ???</translation>
@@ -6019,22 +6127,11 @@
<translation>????? ?? ??????? ??? ?????????????? ??????? ????? ??</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>????? ?? ??????? ??? ?????????????? ????????? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>????????? ??? ??????????????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>?????? ??????? ???????</translation>
@@ -6049,6 +6146,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>?????? ??????? ?????? ? ????? ????? ??????????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>????????? ??? ??????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&??????? ????????</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6089,6 +6202,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%n?</numerusform><numerusform>%n?</numerusform><numerusform>%n?</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>? ??????????</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%n?</numerusform><numerusform>%n?</numerusform><numerusform>%n?</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1?</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%n?</numerusform><numerusform>%n?</numerusform><numerusform>%n?</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>????</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>??? ????? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6129,57 +6287,12 @@
<source>Synced %1</source>
<translation>?????????????? %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%n?</numerusform><numerusform>%n?</numerusform><numerusform>%n?</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>? ??????????</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%n?</numerusform><numerusform>%n?</numerusform><numerusform>%n?</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>????</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1?</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%n?</numerusform><numerusform>%n?</numerusform><numerusform>%n?</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>??? ????? ???????</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation>?????? ???????? ??????? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>? VFS ?????? ?? ?? ?????????? ?????? ???? ?????? ?????????? ?#?.</translation>
@@ -6425,6 +6538,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>?????? ??????? ??? ?????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>?????? ??????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>???? ?? ????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>???? ?? ?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>?????? ??????? ?????? %1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>?????? ?????? ????? ?%1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>?????? %1 ? ??????????? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>???? ?????????????? ??????? ? ???????? ???????</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6614,16 +6770,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6638,6 +6784,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6871,16 +7027,16 @@
<translation>????? ?? ?? ?????? ????? ??????????</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>????????? ??????????????</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>?????????????? ?? ?????????</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>????????? ??????????????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>?????????????? ?????????</translation>
@@ -6939,4 +7095,17 @@
<translation>???????? ??????? ???????</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>?????? ???? ??????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>???? ?????????????? ?? ?????????????? ???? ?????? ??? ????????? ? ????????? ?????? ??????? ???? ?? ?????????. ??? ???? ???????? ?? ??????? ?????? ?????? ???????? ???????? ?????????? ?????????? ???????. ???????, ??????? ??????? ?????????? ??????? ???? ?? ?????????? ? ??????????? ??????.</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_sv.ts nextcloud-desktop-3.16.6/translations/client_sv.ts
--- nextcloud-desktop-3.16.4/translations/client_sv.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_sv.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>Aktivera snabb synk</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>Snabbsynkronisering synkroniserar endast ?ndringar i filer och mappar i mappar som har utforskats. Detta kan avsev?rt ?ka prestandan vid initial konfiguration av virtuella filer. Det kommer dock att orsaka redundanta nedladdningar av filer som flyttas till en outforskad mapp.</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>Aktivera virtuella filer</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation>Till?t borttagning av objekt i papperskorgen</translation>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -558,7 +550,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Legacyimport</translation>
</message>
@@ -573,7 +565,7 @@
<translation>Hoppa ?ver</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>Kunde inte importera konton fr?n ?ldre klientkonfiguration.</translation>
</message>
@@ -581,33 +573,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Lagringsutrymme: ?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>De mappar som inte v?ljs kommer att <b>raderas</b> fr?n det lokala filsystemet och kommer inte att synkroniseras till den h?r datorn l?ngre.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>Avbryt</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Till?mpa</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>Ansluten till <server> som <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>Synkronisera alla</translation>
@@ -638,6 +608,33 @@
<translation>Anslutningsinst?llningar</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Till?mpa</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Lagringsutrymme: ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>Avbryt</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>Ansluten till <server> som <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Inget konto konfigurerat.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>End-to-end-kryptering med virtuella filer</translation>
@@ -672,9 +669,9 @@
<b>Denna process g?r inte att ?ngra. ?r du s?ker p? att du vill forts?tta?</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Inget konto konfigurerat.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation>Gl?m krypteringsinst?llning</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -687,6 +684,11 @@
<translation>Visa krypteringsord</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation>Kryptering ?r konfigurerad. Kom ih?g att <b>Kryptera</b> en mapp f?r att end-to-end-kryptera alla nya filer som l?ggs till i den.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>End-to-end-kryptering har aktiverats f?r detta konto</translation>
@@ -712,6 +714,13 @@
<translation>Mappen har ett synkroniseringsfel. Kryptering av denna mapp kommer att vara m?jlig n?r den v?l har synkroniserats</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation>Du kan inte end-to-end-kryptera den h?r mappen eftersom end-to-end-kryptering ?nnu inte ?r konfigurerad p? den h?r enheten.
+Vill du konfigurera den nu?</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -736,12 +745,6 @@
<translation>Kunde inte kryptera mappen eftersom den inte l?ngre existerar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>?ppna mapp</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>Kryptera</translation>
@@ -780,16 +783,6 @@
<translation>Starta om synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>?teruppta synkronisering</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>Pausa synkronisering</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Ta bort synkroniseringskoppling f?r mapp</translation>
@@ -815,21 +808,11 @@
<translation>Kunde inte skapa mappen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>Kunde inte skapa lokal mapp <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Bekr?fta borttagning av synkroniseringskoppling f?r mapp</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>Vill du verkligen avbryta synkronisering av mappen <i>%1</i>?</p><p><b>Observera:</b> Detta kommer <b>inte</b> radera n?gra filer.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Ta bort synkroniseringskoppling f?r mapp</translation>
@@ -863,24 +846,24 @@
<translation>Krypteringsord f?r end-to-end-kryptering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>F?r att skydda din krypteringsidentitet, krypterar vi den med en minnesregel av 12 ord. Notera dessa krypteringsord och h?ll dem s?kra. De kommer beh?vas f?r att l?gga till andra enheter till ditt konto (t.ex. mobiltelefon eller laptop).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation>F?r att skydda din kryptografiska identitet krypterar vi den med en minnesfras best?ende av 12 ord fr?n en ordlista. Skriv ner den och f?rvara den s?kert. Du kommer att beh?va den f?r att konfigurera synkronisering av krypterade mappar p? dina andra enheter.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>Inaktivera end-to-end-kryptering</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation>Gl?m end-to-end-krypteringen p? den h?r enheten</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>Inaktivera end-to-end-kryptering f?r %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation>Vill du gl?mma inst?llningarna till end-to-end-kryptering f?r %1 p? den h?r enheten?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>Om du tar bort end-to-end-kryptering tar du bort lokalt synkroniserade filer som ?r krypterade.<br>Krypterade filer kommer att finnas kvar p? servern.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation>Att gl?mma end-to-end-kryptering kommer att ta bort k?nslig data och alla krypterade filer fr?n den h?r enheten.<br>Filerna kommer dock att finnas kvar p? servern och p? alla dina andra enheter, om de ?r konfigurerade.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -893,34 +876,44 @@
<translation>En synkronisering p?g?r.<br/>Vill du avbryta den?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) av %2 anv?nds. Vissa mappar, inklusive n?tverks- eller delade mappar, kan ha andra begr?nsningar.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 anv?nds</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 av %2 anv?nds</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>Migrera certifikat till ett nytt</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>F?r n?rvarande finns ingen information om lagringsanv?ndning tillg?nglig.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>Det finns mappar som har vuxit i storlek st?rre ?n %1MB: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 anv?nds</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation>End-to-end-kryptering har initierats p? det h?r kontot med en annan enhet.<br>Ange den unika minnesfrasen f?r att synkronisera de krypterade mapparna ?ven p? den h?r enheten.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 som %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>End-to-end-kryptering har aktiverats p? det h?r kontot med en annan enhet.<br>Krypteringen kan aktiveras p? den h?r enheten genom att ange dina krypteringsord.<br>Detta kommer att m?jligg?ra synkronisering av befintliga krypterade mappar.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>Serverversion %1 st?ds! Forts?tt p? egen risk.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation>Det h?r kontot st?der end-to-end-kryptering, men det m?ste konfigureras f?rst.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>Aktivera kryptering</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Detta konto st?djer end-to-end-kryptering</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -938,79 +931,125 @@
<translation>Servern %1 ?r f?r n?rvarande i underh?llsl?ge.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>Server %1 omdirigeras f?r n?rvarande, eller s? ligger din anslutning bakom en inloggningsportal.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>Utloggad fr?n %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>Ansluter till %1 ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>Dessa mappar har inte synkroniserats f?r att de ?r f?r stora:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>Kan inte ansluta till %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>Det finns mappar som inte synkroniserats f?r att de ?r externa lagringsytor:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Felaktig serverkonfiguration: %1 vid %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>Det finns mappar som inte blivit synkroniserade p? grund av att de ?r f?r stora eller ?r externa lagringsytor: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>Du m?ste acceptera anv?ndarvillkoren p? %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>?ppna mapp</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Ingen %1 anslutning konfigurerad.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>?teruppta synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>Migrera certifikat till ett nytt</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>Pausa synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>Dessa mappar har inte synkroniserats f?r att de ?r f?r stora:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>Kunde inte skapa lokal mapp <i>%1</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>Det finns mappar som inte synkroniserats f?r att de ?r externa lagringsytor:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>Vill du verkligen avbryta synkronisering av mappen <i>%1</i>?</p><p><b>Observera:</b> Detta kommer <b>inte</b> radera n?gra filer.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>Det finns mappar som inte blivit synkroniserade p? grund av att de ?r f?r stora eller ?r externa lagringsytor: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>F?r att skydda din krypteringsidentitet, krypterar vi den med en minnesregel av 12 ord. Notera dessa krypteringsord och h?ll dem s?kra. De kommer beh?vas f?r att l?gga till andra enheter till ditt konto (t.ex. mobiltelefon eller laptop).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>Det finns mappar som har vuxit i storlek st?rre ?n %1MB: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>Inaktivera end-to-end-kryptering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>End-to-end-kryptering har aktiverats p? det h?r kontot med en annan enhet.<br>Krypteringen kan aktiveras p? den h?r enheten genom att ange dina krypteringsord.<br>Detta kommer att m?jligg?ra synkronisering av befintliga krypterade mappar.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>Inaktivera end-to-end-kryptering f?r %1?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Detta konto st?djer end-to-end-kryptering</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>Om du tar bort end-to-end-kryptering tar du bort lokalt synkroniserade filer som ?r krypterade.<br>Krypterade filer kommer att finnas kvar p? servern.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>Aktivera kryptering</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) av %2 anv?nds. Vissa mappar, inklusive n?tverks- eller delade mappar, kan ha andra begr?nsningar.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 av %2 anv?nds</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>F?r n?rvarande finns ingen information om lagringsanv?ndning tillg?nglig.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 som %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>Serverversion %1 st?ds! Forts?tt p? egen risk.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>Server %1 omdirigeras f?r n?rvarande, eller s? ligger din anslutning bakom en inloggningsportal.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>Ansluter till %1 ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>Kan inte ansluta till %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Felaktig serverkonfiguration: %1 vid %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>Du m?ste acceptera anv?ndarvillkoren p? %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Ingen %1 anslutning konfigurerad.</translation>
</message>
</context>
<context>
@@ -1125,11 +1164,6 @@
<translation>Certifikat och nyckel (pkcs12) :</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>V?lj ?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Certifikatl?senord:</translation>
@@ -1140,6 +1174,11 @@
<translation>En krypterad PKCS12-kedja ?r starkt rekommenderad d? en kopia kommer att lagras i konfigurationsfilen.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>V?lj ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>V?lj ett certifikat</translation>
@@ -1190,34 +1229,34 @@
<translation>Forts?tt</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 konton</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 konto</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 mappar</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 mapp</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Legacyimport</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1225,12 +1264,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Kunde inte komma ?t konfigurationsfilen</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>Ett fel uppstod vid l?sning av konfigurationsfilen vid %1. Kontrollera att filen kan n?s av ditt datorkonto.</translation>
</message>
@@ -1272,6 +1311,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation>Filen har ?ndrats sedan den uppt?cktes</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation>Kunde inte ta bort filposten %1 fr?n lokal DB</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation>Filen %1 kan inte laddas ner eftersom den inte ?r virtuell!</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation>Kunde inte h?mta filen %1 fr?n lokal DB</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation>Filen %1 kan inte laddas ner eftersom krypteringsinformation fattas.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation>Fel vid uppdatering av metadata: %1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation>Filen %1 anv?nds f?r n?rvarande</translation>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1279,6 +1357,11 @@
<translation>Fil %1 kan inte laddas upp eftersom en annan fil med samma namn, d?r endast stora/sm? bokst?ver skiljer sig, existerar</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation>Filen inneh?ller inledande eller avslutande mellanslag och kunde inte d?pas om</translation>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Filen %1 har ogiltig ?ndringstid. Ladda inte upp till servern.</translation>
@@ -1483,7 +1566,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>Fel vid skrivning av metadata till databasen</translation>
</message>
@@ -1613,21 +1696,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>Vill du radera mappen <i>%1</i> och allt inneh?ll permanent?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>Vill du radera filen <i>%1</i> permanent?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Bekr?fta radering</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1643,30 +1711,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Inget Nextcloud-konto konfigurerat</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>Vill du radera mappen <i>%1</i> och allt inneh?ll permanent?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Autentiseringsfel: Anv?ndarnamn eller l?senord ?r felaktigt</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>Vill du radera filen <i>%1</i> permanent?</translation>
</message>
<message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Bekr?fta radering</translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
+ <message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Timeout</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>De angivna uppgifterna st?mmer inte</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>Den konfigurerade servern ?r f?r den h?r klienten ?r f?r gammal</translation>
@@ -1676,16 +1744,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>V?nligen uppdatera till den senaste servern och starta om klienten.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Autentiseringsfel: Anv?ndarnamn eller l?senord ?r felaktigt</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Inget Nextcloud-konto konfigurerat</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>De angivna uppgifterna st?mmer inte</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Ett fel uppstod n?r radering av en fil skulle avbrytas</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>Ett fel uppstod n?r radering av %1 skulle avbrytas</translation>
</message>
@@ -1693,19 +1776,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Serverfel: PROPFIND-svar ?r inte XML-formaterat!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>Inst?llningsfel f?r krypterad metadata!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>Inst?llningsfel f?r krypterad metadata: initial signatur fr?n servern ?r tom.</translation>
</message>
@@ -1713,27 +1796,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>Fel uppstod n?r mappen %1 ?ppnades</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Mappen kan inte ?ppnas av klienten, ?tkomst nekad</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Mappen hittades inte: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>Filnamnets teckenupps?ttning ?r ogiltig</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>Ett fel uppstod n?r mappen %1 skulle ?ppnas</translation>
</message>
@@ -1973,11 +2056,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>Den returnerade server-URL:n b?rjar inte med HTTPS trots att inloggnings-URL:n b?rjade med HTTPS. Inloggning kommer inte att vara m?jlig eftersom detta kan vara ett s?kerhetsproblem. Kontakta din administrat?r.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>Den returnerade server-URL:n b?rjar inte med HTTPS trots att inloggnings-URL:n b?rjade med HTTPS. Inloggning kommer inte att vara m?jlig eftersom detta kan vara ett s?kerhetsproblem. Kontakta din administrat?r.</translation>
@@ -1989,28 +2067,33 @@
<translation>Fel returnerat fr?n server: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>Den returnerade server-URL:n b?rjar inte med HTTPS trots att inloggnings-URL:n b?rjade med HTTPS. Inloggning kommer inte att vara m?jlig eftersom detta kan vara ett s?kerhetsproblem. Kontakta din administrat?r.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>Fel uppstod vid ?tkomst till 'token'-endpoint: <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Kunde inte analysera JSON som returnerades fr?n servern: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>Svaret fr?n servern inneh?ll inte alla f?rv?ntade f?lt</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation>Svaret fr?n servern inneh?ll inte alla f?rv?ntade f?lt: <br><em>%1</em></translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Kunde inte analysera JSON som returnerades fr?n servern: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2053,6 +2136,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 har tagits bort.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 har uppdaterats.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 har d?pts om till %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 har flyttats till %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation><numerusform>%1 och %n annan fil har tagits bort.</numerusform><numerusform>%1 och %n andra filer har tagits bort.</numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>V?lj en annan plats. Mappen %1 finns inte.</translation>
@@ -2068,17 +2179,6 @@
<translation>V?lj en annan plats. %1 ?r inte en l?sbar mapp.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 och %n andra filer har tagits bort.</numerusform><numerusform>%1 och %n andra filer har tagits bort.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 har tagits bort.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 fil har lagts till.</numerusform><numerusform>%1 och %n ytterligare filer har lagts till.</numerusform></translation>
@@ -2094,33 +2194,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 och %n andra filer har uppdaterats.</numerusform><numerusform>%1 och %n andra filer har uppdaterats.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 har uppdaterats.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 har d?pts om till %2 och %n andra filer har d?pts om.</numerusform><numerusform>%1 har d?pts om till %2 och %n andra filer har d?pts om.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 har d?pts om till %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 har flyttats till %2 och %n andra filer har flyttats.</numerusform><numerusform>%1 har flyttats till %2 och %n andra filer har flyttats.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 har flyttats till %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2157,68 +2240,68 @@
<translation>Synkroniseringsaktivitet</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Kunde inte l?sa systemets exkluderings-fil</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>En ny mapp st?rre ?n %1 MB har lagts till: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>En mapp fr?n en extern lagringsyta har lagts till.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>V?nligen g? till inst?llningar och v?lj den om du ?nskar att h?mta den.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>En mapp har ?verskridit den inst?llda mappstorleksgr?nsen p? %1MB: %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>Forts?tt synkronisera</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>Sluta synkronisera</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>Mappen %1 har ?verskridit den inst?llda mappstorleksgr?nsen p? %2MB.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>Vill du sluta synkronisera den h?r mappen?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>Mappen %1 skapades men var tidigare exkluderad fr?n synkronisering. Data i denna mapp kommer inte att synkroniseras.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>Filen %1 skapades men var tidigare exkluderad fr?n synkronisering. Den kommer inte att synkroniseras.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2231,12 +2314,12 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>Virtuell filnedladdning misslyckades med koden "%1", status "%2" och felmeddelandet "%3"</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2245,7 +2328,7 @@
Alternativt kan du ?terst?lla alla raderade filer genom att ladda upp fr?n '%1' mappen till servern.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2254,22 +2337,22 @@
Alternativt kan du ?terst?lla alla raderade filer genom att ladda ner dem fr?n servern.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>Forts?tt med radering</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>?terst?ll filer till server</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>?terst?ll filer fr?n servern</translation>
</message>
@@ -2310,11 +2393,6 @@
<translation>Kunde inte ?terst?lla mappens skick</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>En gammal synkroniseringsjournal "%1" hittades, men kunde inte tas bort. Kontrollera att inget program anv?nder den f?r n?rvarande.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(s?kerhetskopia)</translation>
@@ -2325,6 +2403,11 @@
<translation>(s?kerhetkopia %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>En gammal synkroniseringsjournal "%1" hittades, men kunde inte tas bort. Kontrollera att inget program anv?nder den f?r n?rvarande.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Ok?nt tillst?nd.</translation>
@@ -2395,16 +2478,6 @@
<translation>Synkroniseringsbeg?ran avbr?ts.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>Synkronisering ?r pausad.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (synkronisering pausad)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>V?lj en annan plats. Den valda mappen ?r inte giltig.</translation>
@@ -2454,6 +2527,16 @@
F?r att l?sa problemet: ta bort %1 fr?n ett av kontona och skapa en ny synkroniseringsmapp.
F?r avancerade anv?ndare: det h?r problemet kan vara relaterat till flera synkdatabasfiler i en mapp. Kontrollera %1 om det finns f?r?ldrade och oanv?nda .sync_*.db-filer och ta bort dem.</translation>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>Synkronisering ?r pausad.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (synkronisering pausad)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2497,16 +2580,6 @@
<translation>Ett fel uppstod n?r mapplistan f?rs?kte l?sas in fr?n servern.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>H?mtar mapplistan fr?n server ?</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>Det finns ol?sta konflikter. Klicka f?r detaljer.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>St?d f?r virtuella filer ?r aktiverat.</translation>
@@ -2548,16 +2621,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>Nedladdning %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>Fil %1 av %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>Det finns ol?sta konflikter. Klicka f?r detaljer.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>Nedladdning %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>H?mtar mapplistan fr?n server ?</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2604,21 +2692,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 av %2, fil %3 av %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>Fil %1 av %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>V?ntat p? %n andra mapp(ar) ...</numerusform><numerusform>V?ntat p? %n andra mapp(ar) ...</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>Ska b?rja synkronisera</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>V?ntat p? %n andra mapp(ar) ...</numerusform><numerusform>V?ntat p? %n andra mapp(ar) ...</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2778,11 +2861,6 @@
<translation>Generella inst?llningar</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Starta vid uppstart</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>Visa samtalsmeddelanden</translation>
@@ -2793,11 +2871,6 @@
<translation>F?r aktivitetsf?ltet</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Anv?nd &monokroma ikoner</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>Visa chattaviseringar</translation>
@@ -2813,17 +2886,32 @@
<translation>Avancerat</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>Fr?ga innan du synkroniserar nya mappar st?rre ?n</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>Fr?ga innan synkronisering av externa lagringsytor</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Starta vid uppstart</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Anv?nd &monokroma ikoner</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>Fr?ga innan du synkroniserar nya mappar st?rre ?n</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>Meddela n?r synkroniserade mappar v?xer sig st?rre ?n den angivna gr?nsen</translation>
@@ -2834,11 +2922,6 @@
<translation>Inaktivera automatiskt synkronisering av mappar som ?verskrider gr?nsen</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>Fr?ga innan synkronisering av externa lagringsytor</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>Flytta borttagna filer till papperskorgen</translation>
@@ -2890,11 +2973,6 @@
<translation>Uppdateringskanal</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Starta om && Uppdatera</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>&Automatisk kontroll av uppdateringar</translation>
@@ -2915,6 +2993,16 @@
<translation>R?ttsligt meddelande</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation>?terst?ll &Standard</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Starta om && Uppdatera</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>Serveraviseringar som kr?ver uppm?rksamhet.</translation>
@@ -2935,6 +3023,11 @@
<translation>Du kan inte deaktivera autostart eftersom autostart ?r aktiverat p? systemniv?.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation>?terst?ll till &%1</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>stabil</translation>
@@ -3016,6 +3109,11 @@
<source>Debug archive is created at %1</source>
<translation>Fels?kningsarkiv ?r skapat p? %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation>Redigera information som anses k?nslig innan du delar! Fels?kningsarkiv skapat p? %1</translation>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3180,102 +3278,97 @@
<translation>Nytt filnamn</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Byt filnamn</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>Filen "%1" kunde inte synkroniseras eftersom namnet inneh?ller tecken som inte ?r till?tna p? det h?r systemet.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>F?ljande tecken ?r inte till?tna p? systemet: * " | & ? , ; : \ / ~ < > inledande/efterf?ljande mellanslag</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation>F?ljande tecken ?r inte till?tna i systemet: \ / : ? * ? < > | samt inledande/avslutande mellanslag</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>Filen "%1" kunde inte synkroniseras eftersom namnet inneh?ller tecken som inte ?r till?tna p? servern.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>F?ljande tecken ?r inte till?tna: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>F?ljande basnamn ?r inte till?tna: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>F?ljande filnamn ?r inte till?tna: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>F?ljande filtill?gg ?r inte till?tna: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Kontrollerar beh?righeter f?r att byta namn ...</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>Du har inte beh?righet att byta namn p? den h?r filen. Be ?garen till filen att byta namn p? den.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>Misslyckades att h?mta beh?righeter med felet %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>Filnamnet inneh?ller blanksteg i b?rjan och slutet.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>Filnamnet inneh?ller mellanslag i b?rjan.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>Filnamnet inneh?ller blanksteg i slutet.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>Anv?nd ogiltigt namn</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>Filnamnet inneh?ller ogiltiga tecken: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>Kunde inte byta namn p? filen. Kontrollera anslutningen till servern.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>Kunde inte byta namn p? filen eftersom filnamnet ?r upptaget. Ange ett annat filnamn.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>Kunde inte byta namn p? lokal fil. %1</translation>
</message>
@@ -3399,16 +3492,6 @@
<translation><p>En ny version av %1 klienten ?r tillg?nglig.</p><p><b>%2</b> ?r tillg?nglig f?r h?mtning. Den installerade versionen ?r %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Hoppa ?ver denna g?ng</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>H?mta uppdatering</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>Uppdateringen misslyckades</translation>
@@ -3433,6 +3516,16 @@
<source>Update manually</source>
<translation>Uppdatera manuellt</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Hoppa ?ver denna g?ng</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>H?mta uppdatering</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3457,6 +3550,23 @@
<translation>Proxyservern kr?ver autentisering</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>Bandbredd f?r h?mtning</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>Begr?nsa till</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>Observera att proxy-inst?llningar inte anv?nds f?r konton p? localhost</translation>
@@ -3479,46 +3589,29 @@
<translation>Anv?nd globala inst?llningar</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>Bandbredd f?r h?mtning</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>Ingen gr?ns</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>Begr?nsa till</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>Begr?nsa till 3/4 av uppskattad bandbredd</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Bandbredd f?r uppladdning</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Begr?nsa automatiskt</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Bandbredd f?r uppladdning</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>V?rdnamn f?r proxyserver</translation>
@@ -3547,6 +3640,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>Kunde inte s?ka efter uppdateringar.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>Kontrollerar med uppdateringsserver ...</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>Ny %1-uppdatering redo</translation>
@@ -3577,11 +3680,6 @@
<translation>Kunde inte ladda ner uppdateringen. ?ppna %1 f?r att ladda ner uppdateringen manuellt.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>Kunde inte s?ka efter uppdateringar.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>Ny %1 ?r tillg?nglig. ?ppna <a href='%2'>%2</a> f?r att ladda ner uppdateringen.</translation>
@@ -3592,16 +3690,21 @@
<translation>Ny %1 ?r tillg?nglig. ?ppna %2 f?r att ladda ner uppdateringen.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>Kontrollerar med uppdateringsserver ...</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>Uppdateringsstatus ?r ok?nd: Gjorde ingen kontroll av nya uppdateringar.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation>Du anv?nder uppdateringskanalen %1 Din installation ?r den senaste versionen.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation>Inga uppdateringar tillg?ngliga. Din installation ?r den senaste versionen.</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Inga uppdateringar tillg?ngliga. Din installation ?r redan den senaste versionen.</translation>
@@ -3777,11 +3880,6 @@
<translation><font color="green">Lyckades ansluta till %1: %2 version %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>Ogiltig webbadress</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Misslyckades att ansluta till %1 vid %2:<br/>%3</translation>
@@ -3792,6 +3890,16 @@
<translation>F?rs?k att ansluta till %1 p? %2 tog f?r l?ng tid.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>?tkomst f?rbjuden av servern. F?r att bekr?fta att du har korrekta r?ttigheter, <a href="%1">klicka h?r</a> f?r att ansluta till tj?nsten med din webb-l?sare.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>Ogiltig webbadress</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>F?rs?ker ansluta till %1 p? %2 ...</translation>
@@ -3802,11 +3910,6 @@
<translation>Den autentiserade beg?ran till servern omdirigerades till "%1". URL:n ?r felaktig, servern ?r felkonfigurerad.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>?tkomst f?rbjuden av servern. F?r att bekr?fta att du har korrekta r?ttigheter, <a href="%1">klicka h?r</a> f?r att ansluta till tj?nsten med din webb-l?sare.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>Det var ett ogiltigt svar p? en verifierad WebDAV-beg?ran</translation>
@@ -4018,62 +4121,34 @@
<translation>Filnamn som slutar med en punkt st?ds inte p? detta filsystem.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Mapp</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Fil</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation>Mappnamn som inneh?ller tecknet "%1" st?ds inte i detta filsystem.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>%1 namn som inneh?ller tecknet "%2" st?ds inte i det h?r filsystemet.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation>Filnamn som inneh?ller tecknet "%1" st?ds inte i detta filsystem.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>%1 namnet inneh?ller minst ett ogiltigt tecken</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation>Mappnamnet inneh?ller minst ett ogiltigt tecken</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>%1 namnet ?r ett reserverat namn p? det h?r filsystemet.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>Filnamnet inneh?ller minst ett ogiltigt tecken</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation>Mappnamnet ?r ett reserverat namn i detta filsystem.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation>Filnamnet ?r ett reserverat namn i detta filsystem.</translation>
</message>
@@ -4083,6 +4158,24 @@
<translation>Filnamnet inneh?ller inledande blanksteg.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Mapp</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Fil</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>%1 namn som inneh?ller tecknet "%2" st?ds inte i det h?r filsystemet.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4091,6 +4184,16 @@
<translation>Kan inte bytas namn p? eller laddas upp.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>%1 namnet inneh?ller minst ett ogiltigt tecken</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>%1 namnet ?r ett reserverat namn p? det h?r filsystemet.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>Filnamnet inneh?ller inledande blanksteg.</translation>
@@ -4181,64 +4284,74 @@
<translation>Servern svarade inte %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>Det g?r inte att synkronisera p? grund av ogiltig ?ndringstid</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation>Uppladdningen av %1 ?verskrider %2 av ?terst?ende utrymme i personliga filer.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation>Uppladdningen av %1 ?verskrider %2 av ?terst?ende utrymme i mappen %3.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>Kunde inte ladda upp filen eftersom den ?r ?ppen i "%1".</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>Fel vid borttagning av filpost %1 fr?n databasen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>Flyttade till ogiltigt m?l, ?terst?ller</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>Det g?r inte att ?ndra det krypterade objektet eftersom det valda certifikatet ?r ogiltigt.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorerad eftersom den ?r svartlistad i "v?lj vad som ska synkroniseras" </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Otill?tet eftersom du inte har r?ttigheter att l?gga till undermappar i den mappen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Otill?tet eftersom du inte har r?ttigheter att l?gga till filer i den mappen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Inte till?tet att ladda upp denna fil eftersom den ?r skrivskyddad p? servern, ?terst?ller</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>Borttagning till?ts ej, ?terst?ller</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>Fel uppstod n?r databasen skulle l?sas</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>Servern svarade med ett fel n?r mappen l?stes "%1" : %2</translation>
</message>
@@ -4246,38 +4359,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>Kunde inte ta bort filen %1 fr?n lokal DB</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>Fel vid uppdatering av metadata p? grund av ogiltig ?ndringstid</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>Mappen %1 kan inte g?ras skrivskyddad: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>ok?nt fel</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>Ett fel uppstod n?r metadata skulle uppdateras: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>Filen anv?nds</translation>
</message>
@@ -4295,12 +4408,6 @@
<translation>Fil %1 kan inte h?mtas eftersom krypteringsinformation fattas.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>Filen har ?ndrats sedan uppt?ckten</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4357,6 +4464,12 @@
<source>The file %1 is currently in use</source>
<translation>Filen %1 anv?nds f?r tillf?llet</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>Filen har ?ndrats sedan uppt?ckten</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4374,39 +4487,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>kunde inte ta bort fil %1, fel: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>Mapp %1 kan inte skapas p? grund av en konflikt med ett lokalt fil- eller mappnamn!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>Kunde inte skapa mappen %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>Mappen %1 kan inte g?ras skrivskyddad: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>ok?nt fel</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>Ett fel uppstod n?r metadata skulle uppdateras: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>Filen %1 anv?nds f?r tillf?llet</translation>
</message>
@@ -4419,14 +4532,14 @@
<translation>Det gick inte att ta bort %1 p? grund av ett lokalt filnamn</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation>Tillf?lligt fel vid borttagning av lokalt objekt som tagits bort fr?n servern.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Kunde inte ta bort filposten %1 fr?n lokal DB</translation>
</message>
@@ -4434,49 +4547,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>Mapp %1 kan inte byta namn p? grund av en konflikt med ett lokalt fil- eller mappnamn!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>Fil %1 har laddats ner men det resulterade i en konflikt med ett lokalt filnamn!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>Kunde inte h?mta filen %1 fr?n lokal DB</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Kunde inte s?tta pin-status</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>Fel vid uppdatering av metadata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>Filen %1 anv?nds f?r tillf?llet</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>Kunde inte propagera namnbyte p? katalogen i hierarkin</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Kunde inte d?pa om filen</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Kunde inte ta bort filposten %1 fr?n lokal DB</translation>
</message>
@@ -4533,39 +4646,39 @@
<translation>Kunde inte byta namn p? %1 till %2, fel: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>Fel vid uppdatering av metadata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>Filen %1 anv?nds f?r tillf?llet</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Felaktig HTTP-kod i svaret fr?n servern. '201' f?rv?ntades, men "%1 %2" mottogs.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>Kunde inte h?mta filen %1 fr?n lokal DB</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>Kunde inte ta bort filposten %1 fr?n lokal DB</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Kunde inte s?tta pin-status</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>Fel vid skrivning av metadata till databasen</translation>
</message>
@@ -4573,22 +4686,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>Kunde inte ladda upp krypterad fil.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>Fil %1 kan inte laddas upp eftersom en annan fil med samma namn, d?r endast stora/sm? bokst?ver skiljer sig, existerar</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>Uppladdningen av %1 ?verstiger kvoten f?r mappen</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4596,11 +4698,6 @@
<translation>Filen %1 har ogiltig ?ndringstid. Ladda inte upp till servern.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Filen borttagen (starta uppladdning) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Lokal fil ?ndrades under synkronisering. Den kommer ?terupptas.</translation>
@@ -4630,6 +4727,22 @@
<source>The file %1 is currently in use</source>
<translation>Filen %1 anv?nds f?r tillf?llet</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>Uppladdningen av %1 ?verstiger kvoten f?r mappen</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>Kunde inte ladda upp krypterad fil.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Filen borttagen (starta uppladdning) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4822,7 +4935,7 @@
<message>
<location filename="../src/gui/filedetails/sharemodel.cpp" line="757"/>
<source>Secure file drop link</source>
- <translation>S?ker g?md fillista-l?nk</translation>
+ <translation>S?ker filinkast-l?nk</translation>
</message>
<message>
<location filename="../src/gui/filedetails/sharemodel.cpp" line="757"/>
@@ -4842,7 +4955,7 @@
<message>
<location filename="../src/gui/filedetails/sharemodel.cpp" line="769"/>
<source>Secure file drop</source>
- <translation>S?ker g?md fillista</translation>
+ <translation>S?kert filinkast</translation>
</message>
<message>
<location filename="../src/gui/filedetails/sharemodel.cpp" line="969"/>
@@ -4878,6 +4991,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Delningsmeny</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Jag delade n?got med dig</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Delningsalternativ</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Skicka privat l?nk med e-post ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Kopiera privat l?nk till urklipp</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>Det gick inte att kryptera mappen "%1"</translation>
@@ -4912,43 +5051,17 @@
<translation>F?ljande mapp krypterades: "%1"</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Delningsmeny</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>V?lj ny plats ?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Jag delade n?got med dig</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Delningsalternativ</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>Aktivitet</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Kopiera privat l?nk till urklipp</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Skicka privat l?nk med e-post ...</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>L?mna denna delning</translation>
@@ -4964,11 +5077,6 @@
<translation>Vidaredelning av denna mapp ?r inte till?tet</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>Kopiera intern l?nk</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>Kryptera</translation>
@@ -4995,12 +5103,6 @@
<translation><numerusform>G?r ut om %1 minuter</numerusform><numerusform>G?r ut om %1 minuter</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>?ppna i webbl?sare</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>L?s konflikt ?</translation>
@@ -5030,6 +5132,17 @@
<source>Delete</source>
<translation>Ta bort</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>Kopiera intern l?nk</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>?ppna i webbl?sare</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5131,13 +5244,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Denna anslutningen ?r INTE s?ker eftersom den inte ?r krypterad.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Serverversion: %1</translation>
@@ -5157,6 +5263,13 @@
<source>The connection is not secure</source>
<translation>Anslutningen ?r inte s?ker</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Denna anslutningen ?r INTE s?ker eftersom den inte ?r krypterad.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5249,6 +5362,32 @@
<translation>%1 (skippad p? grund av ett tidigare fel, f?rs?k igen om %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Endast %1 tillg?ngligt, beh?ver minst %2 f?r att starta</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>Kunde inte ?ppna eller ?terskapa den lokala synkroniseringsdatabasen. S?kerst?ll att du har skrivr?ttigheter till synkroniseringsmappen.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Diskutrymmet ?r l?gt: H?mtningar som skulle reducera det fria utrymmet under %1 hoppas ?ver.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>Det finns inte tillr?ckligt med utrymme p? servern f?r vissa uppladdningar.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>Ol?st konflikt.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>Kunde inte uppdatera filen: %1</translation>
@@ -5269,22 +5408,6 @@
<translation>Kunde inte st?lla in filposten till lokal DB: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>Ol?st konflikt.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Endast %1 tillg?ngligt, beh?ver minst %2 f?r att starta</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>Kunde inte ?ppna eller ?terskapa den lokala synkroniseringsdatabasen. S?kerst?ll att du har skrivr?ttigheter till synkroniseringsmappen.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Anv?nder virtuella filer med suffix, men suffix ?r inte inst?llt</translation>
@@ -5304,16 +5427,6 @@
<source>Cannot open the sync journal</source>
<translation>Det g?r inte att ?ppna synkroniseringsjournalen</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Diskutrymmet ?r l?gt: H?mtningar som skulle reducera det fria utrymmet under %1 hoppas ?ver.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>Det finns inte tillr?ckligt med utrymme p? servern f?r vissa uppladdningar.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5324,7 +5437,7 @@
<translation>Offline</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>Du beh?ver acceptera anv?ndarvillkoren</translation>
</message>
@@ -5708,11 +5821,6 @@
<source>Less than a minute</source>
<translation>Mindre ?n en minut</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation><numerusform>%n minut(er)</numerusform><numerusform>%n minut(er)</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5720,20 +5828,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation><numerusform>%n timmar</numerusform><numerusform>%n timmar</numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1 minuter</numerusform><numerusform>%1 minuter</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation><numerusform>%n dag(ar)</numerusform><numerusform>%n dag(ar)</numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1 timmar</numerusform><numerusform>%1 timmar</numerusform></translation>
@@ -5748,6 +5846,21 @@
<source>%1 days</source>
<translation><numerusform>%1 dagar</numerusform><numerusform>%1 dagar</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation><numerusform>%n minut(er)</numerusform><numerusform>%n minut(er)</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n timmar</numerusform><numerusform>%n timmar</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n dag(ar)</numerusform><numerusform>%n dag(ar)</numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5890,6 +6003,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>V?nliga logga in</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>Det finns inga synkroniseringsmappar konfigurerade.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>Koppla fr?n %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Serverversion st?ds inte</translation>
@@ -5910,31 +6038,6 @@
<translation>Ditt konto %1 kr?ver att du accepterar din servers anv?ndarvillkor. Du kommer bli omdirigerad till %2 f?r att bekr?fta att du har l?st och h?ller med om villkoren.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>Koppla fr?n %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>Bortkopplad fr?n dessa konton:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Konto %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>V?nliga logga in</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Synkronisering f?r konto ?r avst?ngd</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5956,11 +6059,6 @@
<translation>macOS VFS f?r %1: Ett problem p?tr?ffades.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>Det finns inga synkroniseringsmappar konfigurerade.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>S?ker efter ?ndringar i fj?rrmappen "%1"</translation>
@@ -5971,6 +6069,21 @@
<translation>S?ker efter ?ndringar i lokala "%1"</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>Bortkopplad fr?n dessa konton:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Konto %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Synkronisering f?r konto ?r avst?ngd</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5979,11 +6092,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Lokal mapp</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Anv?ndarnamn</translation>
@@ -6019,22 +6127,11 @@
<translation>Fr?ga innan synkronisering av mappar st?rre ?n</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>Fr?ga innan synkronisering av externa enheter</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>V?lj vad som ska synkroniseras</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Beh?ll lokal data</translation>
@@ -6049,6 +6146,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Radera lokal mapp och starta en fr?sch synkronisering</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>V?lj vad som ska synkroniseras</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Lokal mapp</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6089,6 +6202,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>i framtiden</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1m</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>nu</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>F?r en tid sedan</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6129,57 +6287,12 @@
<source>Synced %1</source>
<translation>Synkroniserade %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>i framtiden</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%nh</numerusform><numerusform>%nh</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>nu</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1m</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%nm</numerusform><numerusform>%nm</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>F?r en tid sedan</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation>Kunde inte ta bort filen</translation>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>S?kv?gar som b?rjar med tecknet '#' st?ds inte i VFS-l?ge.</translation>
@@ -6263,7 +6376,7 @@
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="382"/>
<source>File drop (upload only)</source>
- <translation>G?md fillista (endast uppladdning)</translation>
+ <translation>Filinkast (endast uppladdning)</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareDetailsPage.qml" line="402"/>
@@ -6425,6 +6538,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>?ppna lokala eller gruppmappar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>?ppnar lokal mapp</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Ansluten</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>Bortkopplad</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>?ppna lokala mappen "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>?ppna gruppmappen "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>?ppna %1 i filutforskaren</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>Anv?ndargrupp och meny f?r lokala mappar</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6614,16 +6770,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6638,6 +6784,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6871,16 +7027,16 @@
<translation>Ett fel uppstod under installationen</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>F?rbereder synkronisering</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>Stoppar synkronisering</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>F?rbereder synkronisering</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>Synkronisering pausad</translation>
@@ -6939,4 +7095,17 @@
<translation>Frig?r lokalt utrymme</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>Aktivera snabb synk</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>Snabbsynkronisering synkroniserar endast ?ndringar i filer och mappar i mappar som har utforskats. Detta kan avsev?rt ?ka prestandan vid initial konfiguration av virtuella filer. Det kommer dock att orsaka redundanta nedladdningar av filer som flyttas till en outforskad mapp.</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_th.ts nextcloud-desktop-3.16.6/translations/client_th.ts
--- nextcloud-desktop-3.16.4/translations/client_th.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_th.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -555,7 +547,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
@@ -570,7 +562,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation type="unfinished"/>
</message>
@@ -578,33 +570,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>??????????????: ?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>???????????????????????????<b>??</b>????????????????????????????? ?????????????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>??????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>???????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>???????????? <server> ?????????? <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>?????????????????</translation>
@@ -635,6 +605,33 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>??????????????: ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>???????????? <server> ?????????? <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>????????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation type="unfinished"/>
@@ -668,9 +665,9 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>????????????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -683,6 +680,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation type="unfinished"/>
@@ -708,6 +710,12 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -730,12 +738,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>????????????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>????????</translation>
@@ -774,16 +776,6 @@
<translation>??????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>????????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>?????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>???????????????????????????</translation>
@@ -809,21 +801,11 @@
<translation>????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>???????????????????????????? <i>%1</i></p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>??????????????????????????? <i>%1</i> ???? ? ????????</p><p><b>????????:</b> ?????????????<b>???</b>???????? ?</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>???????????????????????????</translation>
@@ -857,23 +839,23 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -887,34 +869,44 @@
<translation>???????????????????????<br/>??????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>?????????? %1 (%3%) ??? %2 ??????????? ??????????????????????????????????????????????????????????????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>?????????? %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>?????????? %1 ??? %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>?????????????????????????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>?????????? %1</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 ????????? %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>???????????????????????? %1! ?????????????????????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>???????????????????????????????????????????????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -932,80 +924,126 @@
<translation>??????????? %1 ???????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>???????????? %1 ????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>??????????????????? %1 ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>?????????????????????????????????????????????????????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>???????????????????????????????????????????????????????????????????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>?????????????????????????????: %1 ??? %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>????????????????????????????????????????????????????? ??????????????????????????????????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>?????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>???????????????????????????? <i>%1</i></p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>??????????????????????????? <i>%1</i> ???? ? ????????</p><p><b>????????:</b> ?????????????<b>???</b>???????? ?</p></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>????????????????? %1 ??????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>?????????????????????????????????????????????????????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>???????????????????????????????????????????????????????????????????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>?????????? %1 (%3%) ??? %2 ??????????? ??????????????????????????????????????????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>????????????????????????????????????????????????????? ??????????????????????????????????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>?????????? %1 ??? %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>?????????????????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 ????????? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>???????????????????????? %1! ?????????????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>??????????????????? %1 ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>???????????????????????????????????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>?????????????????????????????: %1 ??? %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>????????????????? %1 ??????????????</translation>
+ </message>
</context>
<context>
<name>OCC::AccountSetupFromCommandLineJob</name>
@@ -1119,11 +1157,6 @@
<translation>??????????????? (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>????? ?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>????????????????:</translation>
@@ -1134,6 +1167,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>????? ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>?????????????</translation>
@@ -1184,46 +1222,46 @@
<translation>????????????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>??????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation type="unfinished"/>
</message>
@@ -1265,6 +1303,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1272,6 +1349,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
@@ -1476,7 +1558,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>????????????????????????????????????????????</translation>
</message>
@@ -1606,21 +1688,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>???????????</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1636,30 +1703,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>?????????? Nextcloud ??????????????</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>????????????????????????????: ????????????????????????????????</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>???????????</translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
+ <message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>????????????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>??????????????????????????????????????????????????</translation>
@@ -1669,16 +1736,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>????????????????????????????????????????????????????????????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>????????????????????????????: ????????????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>?????????? Nextcloud ??????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>????????????????????????????</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation type="unfinished"/>
</message>
@@ -1686,19 +1768,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation type="unfinished"/>
</message>
@@ -1706,27 +1788,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>??????????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation type="unfinished"/>
</message>
@@ -1965,11 +2047,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
@@ -1981,15 +2058,14 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
- <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
+ <source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
<message>
@@ -1999,10 +2075,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2045,6 +2127,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ?????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 ?????????????????? %2 ????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 ???????????? %2 ????</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2060,17 +2170,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 ??? %n ???????? ? ????????????</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ????????????</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
@@ -2086,33 +2185,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 ??? %n ???????? ? ?????????????</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ?????????????</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ?????????????????? %2 ?????? %n ???????? ? ??????????????????</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 ?????????????????? %2 ????</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 ???????????? %2 ?????? %n ???????????????</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 ???????????? %2 ????</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2149,67 +2231,67 @@
<translation>????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>??????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>?????????????????????????????????? %1 MB ????: %2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>??????????????????????????????????????????????
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>????????????????????????????????? ??????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2218,41 +2300,41 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation type="unfinished"/>
</message>
@@ -2293,11 +2375,6 @@
<translation>????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(???????????)</translation>
@@ -2308,6 +2385,11 @@
<translation>(??????????? %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation type="unfinished"/>
@@ -2378,16 +2460,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>??????????????????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (???????????????????????)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2434,6 +2506,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>??????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (???????????????????????)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2477,16 +2559,6 @@
<translation>??????????????????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>???????????????????????????????????? ?</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>????????????????????????????? ?????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation type="unfinished"/>
@@ -2528,16 +2600,31 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>????????????????????????????? ?????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation type="unfinished"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>???????????????????????????????????? ?</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2584,21 +2671,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 ??? %2, ??????? %3 ??? %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation type="unfinished"/>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>????????????? %n ???????????? ?</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>????????????? %n ???????????? ?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2758,11 +2840,6 @@
<translation>????????????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&???????????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation type="unfinished"/>
@@ -2773,11 +2850,6 @@
<translation>????????????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>???&??????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2793,17 +2865,32 @@
<translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>????????</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>??????????????????????????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&???????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>???&??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation type="unfinished"/>
@@ -2814,11 +2901,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>??????????????????????????????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation type="unfinished"/>
@@ -2870,11 +2952,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&?????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation type="unfinished"/>
@@ -2895,6 +2972,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&?????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation type="unfinished"/>
@@ -2915,6 +3002,11 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation type="unfinished"/>
@@ -2989,6 +3081,11 @@
<source>Debug archive is created at %1</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3151,102 +3248,97 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>????????????????????????????????? %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation type="unfinished"/>
</message>
@@ -3367,16 +3459,6 @@
<translation><p>????????? %1 ???????????????????????</p><p>???????????????????????? <b>%2</b> ????????????????????? %3</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>?????????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>?????????????</translation>
@@ -3401,6 +3483,16 @@
<source>Update manually</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>?????????</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3425,6 +3517,23 @@
<translation>?????????????????????????????????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>???????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>????????/??</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation type="unfinished"/>
@@ -3447,46 +3556,29 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>???????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>????????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>????????/??</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>????????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>?????????????????? 3/4 ?????????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>?????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>?????????????????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>?????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>??????????????????????????????</translation>
@@ -3515,6 +3607,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>?????????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>%1 ???????????????</translation>
@@ -3545,11 +3647,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>?????????????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation type="unfinished"/>
@@ -3560,14 +3657,19 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
+ <source>Update status is unknown: Did not check for new updates.</source>
+ <translation>???????????????????????: ??????????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
- <source>Update status is unknown: Did not check for new updates.</source>
- <translation>???????????????????????: ??????????????????????????</translation>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
@@ -3745,11 +3847,6 @@
<translation><font color="green">???????????? %1: %2 ???? %3 (%4) ??????????????????</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>URL ??????????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>??????????????????????? %1 ??? %2:<br/>%3</translation>
@@ -3760,6 +3857,16 @@
<translation>?????????????????????????????? %1 ??? %2</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>???????????????????????????????? ???????????????????????????????????????? <a href="%1">??????????</a>??????????????????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>URL ??????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation type="unfinished"/>
@@ -3770,11 +3877,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>???????????????????????????????? ???????????????????????????????????????? <a href="%1">??????????</a>??????????????????????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation type="unfinished"/>
@@ -3980,68 +4082,58 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
+ <source>File names containing the character "%1" are not supported on this file system.</source>
+ <comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
- <source>File names containing the character "%1" are not supported on this file system.</source>
- <comment>%1: the invalid character</comment>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
+ <source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
+ <source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>Folder name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
+ <source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
+ <source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
- <source>File name contains at least one invalid character</source>
+ <location filename="../src/libsync/discovery.cpp" line="433"/>
+ <source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
- <source>Folder name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
- <source>File name is a reserved name on this file system.</source>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="433"/>
- <source>Filename contains trailing spaces.</source>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
@@ -4053,6 +4145,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation type="unfinished"/>
@@ -4143,64 +4245,74 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation type="unfinished"/>
</message>
@@ -4208,38 +4320,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4257,12 +4369,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>????????????????????????????????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4319,6 +4425,12 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>????????????????????????????????</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4336,39 +4448,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>??????????????? %1, ??????????: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -4381,14 +4493,14 @@
<translation>??????????? %1 ????????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4396,49 +4508,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
@@ -4495,39 +4607,39 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>???? HTTP ????????????????????????????????? ?????????????????? 201 ????????? "%1 %2"</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>????????????????????????????????????????????</translation>
</message>
@@ -4535,22 +4647,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>???????????????????? %1 ???????????????????????????????????????? ???????????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>?????????? %1 ?????????????????????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4558,11 +4659,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>???????????????????????????????? ???????????????????</translation>
@@ -4592,6 +4688,22 @@
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>?????????? %1 ?????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4840,6 +4952,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>????????????????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation type="unfinished"/>
@@ -4872,43 +5010,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>????????????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>????????????????????????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation type="unfinished"/>
@@ -4924,11 +5036,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation type="unfinished"/>
@@ -4955,12 +5062,6 @@
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation type="unfinished"/>
@@ -4990,6 +5091,17 @@
<source>Delete</source>
<translation>??</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5091,12 +5203,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>????????????????????????????????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation type="unfinished"/>
@@ -5116,6 +5222,12 @@
<source>The connection is not secure</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>????????????????????????????????????????????????</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5208,6 +5320,32 @@
<translation>%1 (???????????????????????????????????? ?????????????????? %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>??????? %1 ??????????????? %2 ?????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>???????????????????????????????????????????????? ????????????????????????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>???????????????????????: ??????????????????????????????????????? %1 ?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>?????????????????????????????????????????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>???????????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation type="unfinished"/>
@@ -5228,22 +5366,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>???????????????????????????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>??????? %1 ??????????????? %2 ?????????????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>???????????????????????????????????????????????? ????????????????????????????????????????????</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
@@ -5263,16 +5385,6 @@
<source>Cannot open the sync journal</source>
<translation>???????????????????????????</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>???????????????????????: ??????????????????????????????????????? %1 ?????????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>?????????????????????????????????????????????????????????????</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5283,7 +5395,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5667,11 +5779,6 @@
<source>Less than a minute</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5679,20 +5786,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform></translation>
@@ -5707,6 +5804,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5849,6 +5961,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>?????????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>????????????????????? %1 ????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>??????????????????????????????</translation>
@@ -5869,31 +5996,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>????????????????????? %1 ????</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>??????????????????????????:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>????? %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>????????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>?????????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5915,11 +6017,6 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>?????????????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation type="unfinished"/>
@@ -5930,6 +6027,21 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>??????????????????????????:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>????? %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>?????????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5938,11 +6050,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&??????????????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation type="unfinished"/>
@@ -5978,22 +6085,11 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>????????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>???????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation type="unfinished"/>
@@ -6008,6 +6104,22 @@
<source>Erase local folder and start a clean sync</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>???????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&??????????????</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6048,6 +6160,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>???????</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6088,57 +6245,12 @@
<source>Synced %1</source>
<translation type="unfinished"/>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>???????</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>??????</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation type="unfinished"/>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>????????????????</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation type="unfinished"/>
@@ -6384,6 +6496,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6573,16 +6728,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6597,6 +6742,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6830,16 +6985,16 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>???????????????????</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>???????????????????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>????????????????????</translation>
@@ -6898,4 +7053,17 @@
<translation type="unfinished"/>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation type="unfinished"/>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_tr.ts nextcloud-desktop-3.16.6/translations/client_tr.ts
--- nextcloud-desktop-3.16.4/translations/client_tr.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_tr.ts 2025-06-18 22:57:35.000000000 +0200
@@ -48,12 +48,12 @@
<message>
<location filename="../src/gui/tray/CallNotificationDialog.qml" line="176"/>
<source>Talk notification caller avatar</source>
- <translation>Konu? bildirimi ?a?r? yapan avatar?</translation>
+ <translation>Talk bildirimi ?a?r? yapan avatar?</translation>
</message>
<message>
<location filename="../src/gui/tray/CallNotificationDialog.qml" line="235"/>
<source>Answer Talk call notification</source>
- <translation>Konu? ?a?r? bildirimini yan?tla</translation>
+ <translation>Talk ?a?r? bildirimini yan?tla</translation>
</message>
<message>
<location filename="../src/gui/tray/CallNotificationDialog.qml" line="242"/>
@@ -63,7 +63,7 @@
<message>
<location filename="../src/gui/tray/CallNotificationDialog.qml" line="252"/>
<source>Decline Talk call notification</source>
- <translation>Konu? ?a?r? bildirimini reddet</translation>
+ <translation>Talk ?a?r? bildirimini reddet</translation>
</message>
</context>
<context>
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>H?zl? e?itleme kullan?ls?n</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>H?zl? e?itleme yaln?zca ke?fedilen klas?rlerdeki dosya ve klas?rler de?i?ikliklerini e?itler. B?ylece, sanal dosyalar?n ilk yap?land?rmas?ndaki yan?t verme h?z? ?nemli ?l??de art?r?labilir. Bununla birlikte, ke?fedilmemi? bir klas?re ta??nm?? dosyalar?n yeniden indirilmesine neden olur.</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>Sanal dosyalar kullan?ls?n</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -432,7 +424,7 @@
<message>
<location filename="../src/gui/wizard/flow2authwidget.ui" line="26"/>
<source>Browser Authentication</source>
- <translation>Taray?c? kimlik do?rulamas?</translation>
+ <translation>Taray?c? Kimlik Do?rulamas?</translation>
</message>
<message>
<location filename="../src/gui/wizard/flow2authwidget.ui" line="47"/>
@@ -558,7 +550,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>Eski i?e aktarma</translation>
</message>
@@ -573,7 +565,7 @@
<translation>Atla</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>Eski uygulama yap?land?rmas?ndaki hesaplar i?e aktar?lamad?.</translation>
</message>
@@ -581,33 +573,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>Depolama alan?: ?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Se?ilmemi? klas?rler yerel dosya sisteminizden <b>kald?r?lacak</b> ve bir daha bu bilgisayar ile e?itlenmeyecek</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>?ptal</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>Uygula</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation><server> ile <user> olarak ba?lant? kuruldu</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>T?m?n? e?itle</translation>
@@ -638,6 +608,33 @@
<translation>Ba?lant? ayarlar?</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>Uygula</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>Depolama alan?: ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>?ptal</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation><server> ile <user> olarak ba?lant? kuruldu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>Herhangi bir hesap yap?land?r?lmam??.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>Sanal dosyalar ile u?tan uca ?ifreleme</translation>
@@ -645,7 +642,7 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="101"/>
<source>You seem to have the Virtual Files feature enabled on this folder. At the moment, it is not possible to implicitly download virtual files that are end-to-end encrypted. To get the best experience with virtual files and end-to-end encryption, make sure the encrypted folder is marked with "Make always available locally".</source>
- <translation>G?r?n??e g?re bu klas?r i?in sanal dosyalar ?zelli?ini kullan?ma alm??s?n?z. ?u anda u?tan uca ?ifrelenmi? sanal dosyalar?n ?rt?l? olarak indirilmesi desteklenmiyor. Sanal dosyalar ve u?tan uca ?ifreleme ile en iyi deneyimi elde etmek i?in, ?ifrelenmi? klas?r?n "Her zaman yerel olarak kullan?labilsin" olarak i?aretlendi?inden emin olun.</translation>
+ <translation>G?r?n??e g?re bu klas?r i?in sanal dosyalar ?zelli?ini etkinle?tirmi?siniz. ?u anda u?tan uca ?ifrelenmi? sanal dosyalar?n ?rt?l? olarak indirilmesi desteklenmiyor. Sanal dosyalar ve u?tan uca ?ifreleme ile en iyi deneyimi elde etmek i?in, ?ifrelenmi? klas?r?n "Her zaman yerel olarak kullan?labilsin" olarak i?aretlendi?inden emin olun.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="109"/>
@@ -672,9 +669,9 @@
<b>Bu s?re? geri d?nd?r?lemez. ?lerlemek istedi?inize emin misiniz?</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>Herhangi bir hesap yap?land?r?lmam??.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -687,6 +684,11 @@
<translation>An?msat?c? g?r?nt?lensin</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>Bu hesap i?in u?tan uca ?ifreleme kullan?l?yor</translation>
@@ -712,6 +714,12 @@
<translation>Klas?rde bir e?itleme sorunu var. E?itleme tamamland?ktan sonra bu klas?r ?ifrelenebilecek</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -736,12 +744,6 @@
<translation>Klas?r bulunamad???ndan ?ifrelenemedi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>Klas?r? a?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>?ifrele</translation>
@@ -780,16 +782,6 @@
<translation>E?itlemeyi yeniden ba?lat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>E?itlemeyi s?rd?r</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>E?itlemeyi duraklat</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>Klas?r e?itleme ba?lant?s?n? sil</translation>
@@ -815,21 +807,11 @@
<translation>Klas?r olu?turulamad?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p><i>%1</i> yerel klas?r? olu?turulamad?.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Klas?r e?itleme ba?lant?s?n? silmeyi onaylay?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p><i>%1</i> klas?r?n?n e?itlemesini durdurmak istedi?inize emin misiniz?</p><p><b>Not:</b> Bu i?lem herhangi bir dosyay? <b>silmez</b>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>Klas?r e?itleme ba?lant?s?n? sil</translation>
@@ -837,7 +819,7 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="1005"/>
<source>Disable virtual file support?</source>
- <translation>Sanal dosya deste?i kullan?mdan kald?r?ls?n m??</translation>
+ <translation>Sanal dosya deste?i devre d??? b?rak?ls?n m??</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1006"/>
@@ -846,7 +828,7 @@
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
This action will abort any currently running synchronization.</source>
- <translation>Bu i?lem sanal dosya deste?ini kullan?mdan kald?r?r. Bunun sonucunda ?u anda "yaln?zca ?evrim i?i kullan?labilir" olarak i?aretlenmi? klas?rlerin i?eri?i indirilir.
+ <translation>Bu i?lem sanal dosya deste?ini devre d??? b?rak?r. Bunun sonucunda ?u anda "yaln?zca ?evrim i?i kullan?labilir" olarak i?aretlenmi? klas?rlerin i?eri?i indirilir.
Sanal dosya deste?ini kullan?mdan kald?rman?n tek faydas? iste?e ba?l? e?itleme ?zelli?inin yeniden kullan?labilmesidir.
@@ -863,24 +845,24 @@
<translation>U?tan uca ?ifreleme an?msat?c?s?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>?ifreli kimli?iniz, korunmas? i?in 12 s?zl?k s?zc???nden olu?an bir an?msat?c? ile ?ifrelendi. L?tfen bu s?zc?kleri not ederek g?venli bir yerde saklay?n. Bu bilgi hesab?n?za ba?ka ayg?tlar (cep telefonu ya da bilgisayar) eklemek istedi?inizde gerekecek.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>U?tan uca ?ifreleme kullan?lmas?n</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>%1 i?in u?tan uca ?ifreleme kapat?ls?n m??</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>U?tan uca ?ifrelemenin kapat?lmas?, yerel olarak e?itlenmi? ?ifrelenmi? dosyalar? kald?r?r.<br>?ifrelenmi? dosyalar sunucuda kal?r.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -893,34 +875,44 @@
<translation>E?itleme i?lemi s?r?yor.<br/>Durdurmak istiyor musunuz?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 (%3%) / %2 kullan?mda. A? ?zerinden ba?lanm?? ya da payla??lm?? klas?rlerin s?n?rlar? farkl? olabilir.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 kullan?l?yor</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>%1 / %2 kullan?l?yor</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>Sertifikay? yeni birine aktar?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>?u anda depolama kullan?m? ile ilgili bir bilgi yok.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>Boyutu %1MB de?erini a?an klas?rler var: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 kullan?l?yor</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1, %2 olarak</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>Bu hesapta u?tan uca ?ifreleme ba?ka bir ayg?t ile etkinle?tirilmi?.<br>An?msat?c?n?z? yazarak bu ayg?t i?in etkinle?tirebilirsiniz.<br>B?ylece var olan ?ifrelenmi? klas?rler e?itlenmeye ba?lan?r.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>%1 sunucu s?r?m? desteklenmiyor! Riski ?stlenerek s?rd?rebilirsiniz.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>?ifreleme kurulumu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>Bu hesap u?tan uca ?ifrelemeyi destekliyor</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -938,79 +930,125 @@
<translation>%1 sunucusu bak?m kipinde.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>%1 sunucusu y?nlendiriliyor veya ba?lant?n?z bir eri?im sistemi arkas?nda.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>%1 oturumu kapat?ld?.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>%1 ba?lant?s? kuruluyor ?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>?ok b?y?k olduklar? i?in e?itlenmeyen klas?rler var:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>%1 ile ba?lant? kurulamad?.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>D?? depolama alanlar?nda bulunduklar? i?in e?itlenmeyen klas?rler var:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>Sunucu yap?land?rma sorunu: %1 ile %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>?ok b?y?k olduklar? i?in ya da d?? depolama alan?nda bulunduklar? i?in e?itlenmeyen klas?rler var:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>%1 adresindeki hizmet ko?ullar?n? kabul etmelisiniz.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>Klas?r? a?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>Hen?z bir %1 ba?lant?s? yap?land?r?lmam??.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>E?itlemeyi s?rd?r</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>Sertifikay? yeni birine aktar?n</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>E?itlemeyi duraklat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>?ok b?y?k olduklar? i?in e?itlenmeyen klas?rler var:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p><i>%1</i> yerel klas?r? olu?turulamad?.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>D?? depolama alanlar?nda bulunduklar? i?in e?itlenmeyen klas?rler var:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p><i>%1</i> klas?r?n?n e?itlemesini durdurmak istedi?inize emin misiniz?</p><p><b>Not:</b> Bu i?lem herhangi bir dosyay? <b>silmez</b>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>?ok b?y?k olduklar? i?in ya da d?? depolama alan?nda bulunduklar? i?in e?itlenmeyen klas?rler var:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>?ifreli kimli?iniz, korunmas? i?in 12 s?zl?k s?zc???nden olu?an bir an?msat?c? ile ?ifrelendi. L?tfen bu s?zc?kleri not ederek g?venli bir yerde saklay?n. Bu bilgi hesab?n?za ba?ka ayg?tlar (cep telefonu ya da bilgisayar) eklemek istedi?inizde gerekecek.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>Boyutu %1MB de?erini a?an klas?rler var: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>U?tan uca ?ifreleme kullan?lmas?n</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>Bu hesapta u?tan uca ?ifreleme ba?ka bir ayg?t ile kullan?ma al?nm??.<br>An?msat?c?n?z? yazarak bu ayg?t i?in kullan?ma alabilirsiniz.<br>B?ylece var olan ?ifrelenmi? klas?rler e?itlenmeye ba?lan?r.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>%1 i?in u?tan uca ?ifreleme kapat?ls?n m??</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>Bu hesap u?tan uca ?ifrelemeyi destekliyor</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>U?tan uca ?ifrelemenin kapat?lmas?, yerel olarak e?itlenmi? ?ifrelenmi? dosyalar? kald?r?r.<br>?ifrelenmi? dosyalar sunucuda kal?r.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>?ifreleme kurulumu</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 (%3%) / %2 kullan?mda. A? ?zerinden ba?lanm?? ya da payla??lm?? klas?rlerin s?n?rlar? farkl? olabilir.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>%1 / %2 kullan?l?yor</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>?u anda depolama kullan?m? ile ilgili bir bilgi yok.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1, %2 olarak</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>%1 sunucu s?r?m? desteklenmiyor! Riski ?stlenerek s?rd?rebilirsiniz.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>%1 sunucusu y?nlendiriliyor veya ba?lant?n?z bir eri?im sistemi arkas?nda.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>%1 ba?lant?s? kuruluyor ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>%1 ile ba?lant? kurulamad?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>Sunucu yap?land?rma sorunu: %1 ile %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>%1 adresindeki hizmet ko?ullar?n? kabul etmelisiniz.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>Hen?z bir %1 ba?lant?s? yap?land?r?lmam??.</translation>
</message>
</context>
<context>
@@ -1125,11 +1163,6 @@
<translation>Sertifika ve anahtar (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>G?z at ?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>Sertifika parolas?:</translation>
@@ -1140,6 +1173,11 @@
<translation>Bir kopyas? yap?land?rma dosyas?nda saklanaca??ndan ?ifrelenmi? bir pkcs12 paketi ?nerilir.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>G?z at ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>Bir sertifika se?in</translation>
@@ -1190,34 +1228,34 @@
<translation>S?rd?r</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 hesap</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 hesap</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 klas?r</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 klas?r</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>Eskileri i?e aktarma</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1225,12 +1263,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>Yap?land?rma dosyas?na eri?ilirken sorun ??kt?</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>%1 ?zerindeki yap?land?rma dosyas?na eri?ilirken bir sorun ??kt?. L?tfen sistem hesab?n?z?n yap?land?rma dosyas?na eri?me izinlerinin oldu?undan emin olun.</translation>
</message>
@@ -1240,7 +1278,7 @@
<message>
<location filename="../src/gui/authenticationdialog.cpp" line="30"/>
<source>Authentication Required</source>
- <translation>Kimlik do?rulamas? gerekli</translation>
+ <translation>Kimlik Do?rulamas? Gerekli</translation>
</message>
<message>
<location filename="../src/gui/authenticationdialog.cpp" line="32"/>
@@ -1272,6 +1310,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1279,6 +1356,11 @@
<translation>%1 dosyas?, ad?n?n ba?ka bir dosya ile ?ak??mas? nedeniyle y?klenemedi, dosya adlar? aras?nda yaln?zca b?y?k k???k harf fark? var</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>%1 dosyas?n?n de?i?tirilme zaman? ge?ersiz. Sunucuya y?klenmedi.</translation>
@@ -1483,7 +1565,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>?st veri veri taban?na yaz?l?rken sorun ??kt?</translation>
</message>
@@ -1613,21 +1695,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation><i>%1</i> klas?r?n? ve i?indekilerin t?m?n? silmek istiyor musunuz?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation><i>%1</i> dosyas?n? silmek istiyor musunuz?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>Silmeyi onaylay?n</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1643,30 +1710,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Herhangi bir Nextcloud hesab? yap?land?r?lmam??</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation><i>%1</i> klas?r?n? ve i?indekilerin t?m?n? silmek istiyor musunuz?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>Kimlik do?rulama sorunu: Kullan?c? ad? ya da parola hatal?.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation><i>%1</i> dosyas?n? silmek istiyor musunuz?</translation>
</message>
<message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>Silmeyi onaylay?n</translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
+ <message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>Zaman a??m?</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>Yaz?lan kimlik do?rulama bilgileri do?ru de?il</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>Bu istemci i?in yap?land?r?lm?? sunucu ?ok eski</translation>
@@ -1676,16 +1743,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>L?tfen sunucuyu en son s?r?me g?ncelleyin ve istemciyi yeniden ba?lat?n.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>Kimlik do?rulama sorunu: Kullan?c? ad? ya da parola hatal?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Herhangi bir Nextcloud hesab? yap?land?r?lmam??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>Yaz?lan kimlik do?rulama bilgileri do?ru de?il</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>Bir dosyan?n silinmesi iptal edilirken sorun ??kt?</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>%1 silinmesi iptal edilirken sorun ??kt?</translation>
</message>
@@ -1693,19 +1775,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Sunucu hatas?: PROPFIND yan?t? XML bi?iminde de?il!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>?ifrelenmi? ?st veri kurulumu sorunu!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>?ifrelenmi? ?st veri kurulum hatas?: Sunucudan gelen ilk imza bo?.</translation>
</message>
@@ -1713,27 +1795,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>%1 klas?r? a??l?rken sorun ??kt?</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>?stemciden klas?re eri?ilemedi, izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>Klas?r bulunamad?: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>Dosya ad? kodlamas? ge?ersiz</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>%1 klas?r? okunurken sorun ??kt?</translation>
</message>
@@ -1973,11 +2055,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>Oturum a?ma adresi HTTPS ile ba?lamas?na ra?men oylama adresi HTTPS ile ba?lam?yor. Bu bir g?venlik sorunu olabilece?inden oturum a??lmayacak. L?tfen BT y?neticinize ba?vurun.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>Oturum a?ma adresi HTTPS ile ba?lamas?na ra?men geri d?nd?r?len sunucu adresi HTTPS ile ba?lam?yor. Bu bir g?venlik sorunu olabilece?inden oturum a??lmayacak. L?tfen BT y?neticinize ba?vurun.</translation>
@@ -1989,28 +2066,33 @@
<translation>Sunucudan hata yan?t? al?nd?: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>Oturum a?ma adresi HTTPS ile ba?lamas?na ra?men oylama adresi HTTPS ile ba?lam?yor. Bu bir g?venlik sorunu olabilece?inden oturum a??lmayacak. L?tfen BT y?neticinize ba?vurun.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>"kod" u? noktas?na eri?ilirken bir sorun ??kt?: <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>Sunucudan al?nan JSON i?lenemedi: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>Sunucudan al?nan yan?tta beklenen t?m alanlar yok</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation>Sunucudan al?nan yan?tta beklenen t?m alanlar yok: <br><em>%1</em></translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>Sunucudan al?nan JSON i?lenemedi: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2053,6 +2135,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 kald?r?ld?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 g?ncellendi.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1, %2 olarak adland?r?ld?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1, %2 konumuna ta??nd?.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>L?tfen farkl? bir konum se?in. %1 klas?r? bulunamad?.</translation>
@@ -2068,17 +2178,6 @@
<translation>L?tfen farkl? bir konum se?in. %1 klas?r? okunabilir de?il.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 ve di?er %n dosya kald?r?ld?.</numerusform><numerusform>%1 ve di?er %n dosya kald?r?ld?.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 kald?r?ld?.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 ve di?er %n dosya eklendi.</numerusform><numerusform>%1 ve di?er %n dosya eklendi.</numerusform></translation>
@@ -2094,33 +2193,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 ve di?er %n dosya g?ncellendi.</numerusform><numerusform>%1 ve di?er %n dosya g?ncellendi.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 g?ncellendi.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1, %2 olarak yeniden adland?r?ld? ve di?er %n dosyan?n ad? de?i?tirildi.</numerusform><numerusform>%1, %2 olarak yeniden adland?r?ld? ve di?er %n dosyan?n ad? de?i?tirildi.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1, %2 olarak adland?r?ld?.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1, %2 konumuna ta??nd? ve di?er %n dosya ta??nd?.</numerusform><numerusform>%1, %2 konumuna ta??nd? ve di?er %n dosya ta??nd?.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1, %2 konumuna ta??nd?.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2157,68 +2239,68 @@
<translation>E?itleme i?lemi</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>Sistem kat?lmayacaklar dosyas? okunamad?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>%1 MB boyutundan b?y?k yeni bir klas?r eklendi: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>D?? depolama alan?ndan bir klas?r eklendi.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>?ndirmek istiyorsan?z se?mek i?in l?tfen ayarlar b?l?m?ne gidin.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>Bir klas?r?n boyutu %1MB olan klas?r boyutu s?n?r?n? a?t? : %2.
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>E?itlemeyi s?rd?r</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>E?itlemeyi durdur</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>%1 klas?r?n?n boyutu %2MB olan klas?r boyutu s?n?r?n? a?t?.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>Bu klas?r?n e?itlenmesini durdurmak ister misiniz?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>%1 klas?r? olu?turulmu? ancak daha ?nce e?itleme d??? b?rak?lm??. Bu klas?rdeki veriler e?itlenmeyecek.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>%1 dosyas? olu?turulmu? ancak daha ?nce e?itleme d??? b?rak?lm??. Bu dosyadaki veriler e?itlenmeyecek.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2229,12 +2311,12 @@
Bunun sonucunda e?itleme istemcisi yerel de?i?iklikleri an?nda y?kleyemez. Onun yerine yaln?zca yerel de?i?iklikleri tarar ve aral?klarla y?kler (varsay?lan olarak iki saatte bir).</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>Sanal dosya indirilemedi. Kod: "%1" Durum: "%2" Hata iletisi: "%3"</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2243,7 +2325,7 @@
Bir yanl??l?k varsa, silinen t?m dosyalar? '%1' klas?r?nden sunucuya geri y?kleyebilirsiniz.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2252,22 +2334,22 @@
Bir yanl??l?k varsa, silinen t?m dosyalar? sunucudan indirerek geri y?kleyebilirsiniz.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>T?m dosyalar silinsin mi?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>Silme i?lemini tamamla</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>Dosyalar? sunucuya geri y?kle</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>Dosyalar? sunucudan geri y?kle</translation>
</message>
@@ -2308,11 +2390,6 @@
<translation>Klas?r durumu s?f?rlanamad?</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>Eski bir "%1" e?itleme g?nl??? bulundu ancak kald?r?lamad?. G?nl???n Ba?ka bir uygulama taraf?ndan kullan?lmad???ndan emin olun.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation> (yedek)</translation>
@@ -2323,6 +2400,11 @@
<translation> (yedek %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>Eski bir "%1" e?itleme g?nl??? bulundu ancak kald?r?lamad?. G?nl???n Ba?ka bir uygulama taraf?ndan kullan?lmad???ndan emin olun.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>Tan?mlanmam?? durum.</translation>
@@ -2393,16 +2475,6 @@
<translation>E?itleme iste?i iptal edildi.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>E?itleme duraklat?ld?.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (e?itleme duraklat?ld?)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>L?tfen farkl? bir konum se?in. Se?ilmi? klas?r bulunamad?.</translation>
@@ -2450,7 +2522,17 @@
<translation>%1 klas?r? birden fazla hesaba ba?l?.
Bu kurulum veri kayb?na neden olabilir ve art?k desteklenmiyor.
Bu sorunu ??zmek i?in: l?tfen %1 klas?r?n? hesaplar?n birinden kald?r?n ve yeni bir e?itleme klas?r? olu?turun.
-Uzman kullan?c?lar i?in: Bu sorun, bir klas?rde bulunan birden fazla e?itleme veri taban? dosyas?yla ilgili olabilir. L?tfen %1 klas?r?ndeki g?ncel olmayan ve kullan?lmayan .sync_*.db dosyalar?n? denetleyip kald?r?n.</translation>
+Uzman kullan?c?lar i?in: Bu sorun, bir klas?rde bulunan birden fazla e?itleme veritaban? dosyas?yla ilgili olabilir. L?tfen %1 klas?r?ndeki g?ncel olmayan ve kullan?lmayan .sync_*.db dosyalar?n? denetleyip kald?r?n.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>E?itleme duraklat?ld?.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (e?itleme duraklat?ld?)</translation>
</message>
</context>
<context>
@@ -2495,19 +2577,9 @@
<translation>Klas?r listesi sunucudan y?klenirken sorun ??kt?.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>Sunucudan klas?r listesi al?n?yor ?</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>??z?mlenmemi? ?ak??malar var. Ayr?nt?l? bilgi i?in t?klay?n.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
- <translation>Sanal dosya deste?i kullan?ma al?nd?.</translation>
+ <translation>Sanal dosya deste?i etkinle?tirildi.</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="284"/>
@@ -2546,16 +2618,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>?ndirme %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>Dosya %1 / %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>??z?mlenmemi? ?ak??malar var. Ayr?nt?l? bilgi i?in t?klay?n.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>?ndirme %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>Sunucudan klas?r listesi al?n?yor ?</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2602,21 +2689,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 / %2, %3 / %4 dosya</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>Dosya %1 / %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>Di?er %n klas?r bekleniyor ?</numerusform><numerusform>Di?er %n klas?r bekleniyor ?</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>E?itleme ba?lamak ?zere</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>Di?er %n klas?r bekleniyor ?</numerusform><numerusform>Di?er %n klas?r bekleniyor ?</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2776,11 +2858,6 @@
<translation>Genel ayarlar</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&Sistem ba?lang?c?nda ?al??t?r?ls?n</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>?a?r? bildirimleri g?r?nt?lensin</translation>
@@ -2791,11 +2868,6 @@
<translation>Sistem ?ekmecesi i?in</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>Tek &renkli simgeler kullan?ls?n</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>Sohbet bildirimleri g?r?nt?lensin</translation>
@@ -2811,17 +2883,32 @@
<translation>Geli?mi?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>?u boyuttan b?y?k yeni klas?rlerin e?itlenmesi i?in onay istensin</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>D?? depolama ayg?tlar? ile e?itleme i?in onay istensin</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&Sistem ba?lang?c?nda ?al??t?r?ls?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>Tek &renkli simgeler kullan?ls?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>?u boyuttan b?y?k yeni klas?rlerin e?itlenmesi i?in onay istensin</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>Klas?rler e?itlenirken belirtilen s?n?r a??l?rsa bildirilsin</translation>
@@ -2832,11 +2919,6 @@
<translation>S?n?r? a?an klas?rlerin e?itlenmesi otomatik olarak durdurulsun</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>D?? depolama ayg?tlar? ile e?itleme i?in onay istensin</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>Silinen dosyalar ??pe at?ls?n</translation>
@@ -2888,11 +2970,6 @@
<translation>G?ncelleme kanal?</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&Yeniden ba?lat ve g?ncelle</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>&G?ncellemeler otomatik olarak denetlensin</translation>
@@ -2913,6 +2990,16 @@
<translation>Yasal bildirim</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&Yeniden ba?lat ve g?ncelle</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>?lgilenmeniz gereken sunucu bildirimleri.</translation>
@@ -2930,7 +3017,12 @@
<message>
<location filename="../src/gui/generalsettings.cpp" line="218"/>
<source>You cannot disable autostart because system-wide autostart is enabled.</source>
- <translation>Otomatik ba?latma sistem genelinde kullan?ma al?nm?? oldu?undan, otomatik ba?latma kullan?mdan kald?r?lamaz.</translation>
+ <translation>Otomatik ba?latma sistem genelinde etkinle?tirilmi? oldu?undan, otomatik ba?latma devre d??? b?rak?lamaz.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
@@ -3014,6 +3106,11 @@
<source>Debug archive is created at %1</source>
<translation>%1 ?zerinde hata ay?klama ar?ivi olu?turuldu</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3178,102 +3275,97 @@
<translation>Yeni dosya ad?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>Dosyay? yeniden adland?r</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>Ad?nda bu sistemde kullan?lmas?na izin verilmeyen karakterler bulundu?undan "%1" dosyas? e?itlenemedi.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>Sistemde dosya adlar?nda kullan?lmas?na izin verilmeyen karakterler: * " | & ? , ; : \ / ~ < > ba?ta ve sondaki bo?luklar</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation>Sistemde dosya adlar?nda kullan?lmas?na izin verilmeyen karakterler: \ / : ? * " < > | ba?ta ve sondaki bo?luklar</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>Ad?nda bu sunucuda kullan?lmas?na izin verilmeyen karakterler bulundu?undan "%1" dosyas? e?itlenemedi.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>?u karakterlere izin verilmiyor: %s</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>?u temel adlara izin verilmiyor: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>?u dosya adlar?na izin verilmiyor: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>?u dosya uzant?lar?na izin verilmiyor: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>Yeniden adland?rma izinleri denetleniyor?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>Bu dosyay? yeniden adland?rma izniniz yok. Dosya sahibinden dosyan?n ad?n? de?i?tirmesini isteyebilirsiniz.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>?zinler %1 hatas? ile al?namad?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>Dosya ad?n?n ba??nda ve sonunda bo?luklar var.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>Dosya ad?n?n ba??nda bo?luklar var.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>Dosya ad?n?n ba??nda bo?luklar var.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>Ge?ersiz ad kullan?ls?n</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>Dosya ad?nda izin verilmeyen karakterler var: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>Dosya yeniden adland?r?lamad?. Sunucuya ba?l? oldu?unuzdan emin olun.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>Ayn? adl? bir dosya sunucu ?zerinde zaten var oldu?undan dosya yeniden adland?r?lamad?. L?tfen ba?ka bir ad se?in.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>%1 yerel dosyas? yeniden adland?r?lamad?</translation>
</message>
@@ -3316,7 +3408,7 @@
If enabled, logs will be written to %1</source>
<translation>?stemci uygulamas? hata ay?klama g?nl?klerini bir ge?ici klas?re yazabilir. Bu g?nl?kler sorunlar? ??zmek i?in ?ok yararl?d?r.
G?nl?k dosyalar?n?n boyutu b?y?k olabildi?inden, istemci uygulamas? her e?itleme i?leminde eski g?nl?kleri s?k??t?rarak yeni g?nl?kle olu?turur. Ayr?ca ?ok fazla disk alan?n?n kullan?lmamas? i?in g?nl?k dosyalar? bir ka? saat sonra silinir.
-Bu se?enek kullan?ma al?nd???nda g?nl?kler %1 klas?r?ne yaz?l?r</translation>
+Bu se?enek etkinse g?nl?kler %1 klas?r?ne yaz?l?r</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.cpp" line="64"/>
@@ -3397,16 +3489,6 @@
<translation><p>Yeni bir %1 istemcisi s?r?m? yay?nlanm??.</p><p><b>%2</b> indirilebilir. Kurulu s?r?m %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>Bu kez atla</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>G?ncellemeyi al</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>G?ncellenemedi</translation>
@@ -3431,6 +3513,16 @@
<source>Update manually</source>
<translation>El ile g?ncelle</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>Bu kez atla</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>G?ncellemeyi al</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3455,6 +3547,23 @@
<translation>Vekil sunucusu i?in kimlik do?rulamas? gerekiyor</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>?ndirme bant geni?li?i</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>?ununla s?n?rla</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBayt/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>Not: Vekil sunucu ayarlar? localhost ?zerindeki hesaplar i?in uygulanmaz</translation>
@@ -3477,46 +3586,29 @@
<translation>Genel ayarlar kullan?ls?n</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>?ndirme bant geni?li?i</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>S?n?rlama yok</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBayt/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>?ununla s?n?rla</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>?ng?r?len bant geni?li?inde 3/4 </translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>Y?kleme bant geni?li?i</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>Otomatik s?n?rlama</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>Y?kleme bant geni?li?i</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>Vekil sunucu ad?</translation>
@@ -3545,6 +3637,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>G?ncellemeler denetlenemedi.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>G?ncelleme sunucusu denetleniyor ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>Yeni %1 g?ncellemesi yay?nlanm??</translation>
@@ -3575,11 +3677,6 @@
<translation>G?ncelleme indirilemedi. L?tfen g?ncellemeyi el ile indirmek i?in %1 a??n.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>G?ncellemeler denetlenemedi.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>Yeni %1 yay?nlanm??. L?tfen g?ncellemeyi indirmek i?in <a href='%2'>%2</a> sitesini a??n.</translation>
@@ -3590,16 +3687,21 @@
<translation>Yeni %1 yay?nlanm??. L?tfen g?ncellemeyi indirmek i?in %2 a??n.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>G?ncelleme sunucusu denetleniyor ?</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>G?ncelleme durumu bilinmiyor: Yeni g?ncellemeler denetlenemedi.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>Herhangi bir g?ncelleme yok. Son s?r?m? kullan?yorsunuz.</translation>
@@ -3775,11 +3877,6 @@
<translation><font color="green">%1 ba?lant?s? kuruldu: %2 s?r?m %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>Adres ge?ersiz</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>%1 ile %2 zaman?nda ba?lant? kurulamad?:<br/>%3</translation>
@@ -3790,6 +3887,16 @@
<translation>%1 ile %2 zaman?nda ba?lant? kurulurken zaman a??m?.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>Eri?im sunucu taraf?ndan engellendi. Taray?c?n?z ile hizmete eri?erek yeterli izne sahip olup olmad???n?z? do?rulamak i?in <a href="%1">buraya t?klay?n</a>.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>Adres ge?ersiz</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>%2 ?zerindeki %1 ile ba?lant? kuruluyor ?</translation>
@@ -3800,11 +3907,6 @@
<translation>Sunucuya yap?lan kimlik do?rulama iste?i "%1" adresine y?nlendirildi. Adres ya da sunucu yap?land?rmas? hatal?.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>Eri?im sunucu taraf?ndan engellendi. Taray?c?n?z ile hizmete eri?erek yeterli izne sahip olup olmad???n?z? do?rulamak i?in <a href="%1">buraya t?klay?n</a>.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>Kimli?i do?rulanm?? bir WebDAV iste?ine ge?ersiz bir yan?t verildi</translation>
@@ -3914,12 +4016,12 @@
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="701"/>
<source>Virtual files enabled</source>
- <translation>Sanal dosyalar kullan?ma al?nd?</translation>
+ <translation>Sanal dosyalar etkinle?tirildi</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="702"/>
<source>Your account is now syncing with virtual files support. This means that all your files are online-only by default, and will be downloaded on-demand when you open them. You may find your files under the <b>Locations</b> section of the Finder sidebar.</source>
- <translation>Hesab?n?z art?k sanal dosya deste?iyle e?itleniyor. Bu se?enek kullan?ma al?nd???nda, t?m dosyalar?n?z varsay?lan olarak yaln?zca ?evrim i?i kullan?l?r ve istek ?zerine indirilir. Dosyalar?n?z? Finder kenar ?ubu?unun <b>Konumlar</b> b?l?m?nde bulabilirsiniz.</translation>
+ <translation>Hesab?n?z art?k sanal dosya deste?iyle e?itleniyor. Bu se?enek etkinse, t?m dosyalar?n?z varsay?lan olarak yaln?zca ?evrim i?i kullan?l?r ve istek ?zerine indirilir. Dosyalar?n?z? Finder kenar ?ubu?unun <b>Konumlar</b> b?l?m?nde bulabilirsiniz.</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="745"/>
@@ -3947,7 +4049,7 @@
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="491"/>
<source>Enable experimental feature?</source>
- <translation>Deneysel ?zellikler kullan?ma al?ns?n m??</translation>
+ <translation>Deneysel ?zellikler etkinle?tirilsin mi?</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="492"/>
@@ -3958,7 +4060,7 @@
Switching to this mode will abort any currently running synchronization.
This is a new, experimental mode. If you decide to use it, please report any issues that come up.</source>
- <translation>"Sanal dosyalar" kipi kullan?ma al?nd???nda, ba?lang??ta hi? bir dosya indirilmez. Onun yerine sunucudaki her dosya i?in k???k bir "%1" dosyas? olu?turulur. Bu dosyalar y?r?t?lerek ya da sa? t?k men?s? kullan?larak dosyalar?n i?eri?i indirilebilir.
+ <translation>"Sanal dosyalar" kipi etkinle?tirildi?inde, ba?lang??ta hi?bir dosya indirilmez. Onun yerine sunucudaki her dosya i?in k???k bir "%1" dosyas? olu?turulur. Bu dosyalar y?r?t?lerek ya da sa? t?k men?s? kullan?larak dosyalar?n i?eri?i indirilebilir.
Sanal dosya kipinde kar??l?kl? ayr?cal?kl? se?meli e?itleme yap?rl?r. ?u anda se?ilmemi? klas?rler yaln?zca ?evrim i?i klas?rlere ?evrilir ve se?meli e?itleme ayarlar?n?z s?f?rlan?r.
@@ -3969,7 +4071,7 @@
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="506"/>
<source>Enable experimental placeholder mode</source>
- <translation>Deneysel yer belirteci kipi kullan?ma al?ns?n</translation>
+ <translation>Deneysel yer belirteci kipi etkinle?tir</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="507"/>
@@ -4016,62 +4118,34 @@
<translation>Nokta ile biten dosya adlar? bu dosya sisteminde desteklenmiyor.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Klas?r</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>Dosya</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation>"%1" karakterinin bulundu?u klas?r adlar? bu sistemde desteklenmiyor.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>"%2" karakterinin bulundu?u %1 dosya ad? bu dosya sisteminde desteklenmiyor.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation>"%1" karakterinin bulundu?u dosya adlar? bu sistemde desteklenmiyor.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>%1 ad?nda en az bir ge?ersiz karakter bulunuyor</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation>Klas?r ad?nda en az bir ge?ersiz karakter var</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>%1 dosya ad? bu dosya sisteminde ayr?lm?? ve kullan?lamaz.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>Dosya ad?nda en az bir ge?ersiz karakter var</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation>Klas?r ad? bu dosya sisteminde ayr?lm?? ve kullan?lamaz.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation>Dosya ad? bu dosya sisteminde ayr?lm?? ve kullan?lamaz.</translation>
</message>
@@ -4081,6 +4155,24 @@
<translation>Dosya ad?n?n sonunda bo?luklar var.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Klas?r</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>Dosya</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>"%2" karakterinin bulundu?u %1 dosya ad? bu dosya sisteminde desteklenmiyor.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4089,6 +4181,16 @@
<translation>Yeniden adland?r?lamad? ya da y?klenemedi.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>%1 ad?nda en az bir ge?ersiz karakter bulunuyor</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>%1 dosya ad? bu dosya sisteminde ayr?lm?? ve kullan?lamaz.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>Dosya ad?n?n ba??nda bo?luklar var.</translation>
@@ -4179,64 +4281,74 @@
<translation>Sunucunun bildirilen numaras? %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>De?i?tirilme zaman? ge?ersiz oldu?undan e?itlenemedi</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>Dosya "%1" i?inde a??k oldu?undan y?klenemedi.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>%1 dosya kayd? veri taban?ndan silinirken sorun ??kt?</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>Ge?ersiz bir hedefe ta??nd?, geri y?kleniyor</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>Se?ilmi? sertifika ge?ersiz oldu?undan ?ifrelenmi? ?ge de?i?tirilemez.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>"E?itlenecek ?geleri se?in" kara listesinde oldu?undan yok say?ld?</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Bu klas?re alt klas?r ekleme izniniz olmad???ndan izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Bu klas?re dosya ekleme izniniz olmad???ndan izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Sunucu ?zerinde salt okunur oldu?undan, bu dosya y?klenemedi, geri y?kleniyor</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>Silmeye izin verilmedi, geri y?kleniyor</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
- <translation>Veri taban? okunurken sorun ??kt?</translation>
+ <translation>Veritaban? okunurken sorun ??kt?</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>"%1" klas?r? okunurken sunucu bir hata yan?t? verdi: %2</translation>
</message>
@@ -4244,38 +4356,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>%1 dosyas? yerel veri taban?ndan silinemedi</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>De?i?tirilme zaman? ge?ersiz oldu?undan ?st veriler y?klenirken sorun ??kt?</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>%1 klas?r? salt okunur yap?lamaz: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>bilinmeyen bir sorun ??kt?</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>?st veriler g?ncellenirken sorun ??kt?: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>Dosya ?u anda kullan?l?yor</translation>
</message>
@@ -4293,12 +4405,6 @@
<translation>%1 dosyas?, ad?n?n ?ifreleme bilgilerinin eksik olmas? nedeniyle indirilemedi.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>Dosya taramadan sonra de?i?tirilmi?</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4355,6 +4461,12 @@
<source>The file %1 is currently in use</source>
<translation>%1 dosyas? ?u anda kullan?l?yor</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>Dosya taramadan sonra de?i?tirilmi?</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4372,39 +4484,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>%1 dosyas? silinemedi, hata: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>%1 klas?r?, ad?n?n yerel bir dosya ya da klas?r ile ?ak??mas? nedeniyle olu?turulamad?!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>%1 klas?r? olu?turulamad?</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>%1 klas?r? salt okunur yap?lamaz: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>bilinmeyen bir sorun ??kt?</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>?st veriler g?ncellenirken sorun ??kt?: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>%1 dosyas? ?u anda kullan?l?yor</translation>
</message>
@@ -4417,14 +4529,14 @@
<translation>Yerel bir dosya ad? ile ?ak??mas? nedeniyle %1 dosyas? %2 olarak adland?r?lamad?</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation>Sunucudan silinen yerel ?ge silinirken ge?ici bir sorun ??kt?.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>%1 dosya kayd? yerel veri taban?ndan silinemedi</translation>
</message>
@@ -4432,49 +4544,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>Yerel dosya veya klas?r ad? ?ak??mas? nedeniyle %1 klas?r? yeniden adland?r?lamad?!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>%1 dosyas? indirildi ancak ad? yerel bir dosya ile ?ak???yor!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>%1 dosyas? yerel veri taban?ndan al?namad?</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Sabitleme durumu ayarlan?rken sorun ??kt?</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>?st veriler g?ncellenirken sorun ??kt?: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>%1 dosyas? ?u anda kullan?l?yor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>Hiyerar?i i?inde klas?r? yeniden adland?rma i?lemi yap?lamad?</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>Dosya yeniden adland?r?lamad?</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>%1 dosya kayd? yerel veri taban?ndan silinemedi</translation>
</message>
@@ -4531,39 +4643,39 @@
<translation>%1, %2 olarak yeniden adland?r?lamad?, hata: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>?st veriler g?ncellenirken sorun ??kt?: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>%1 dosyas? ?u anda kullan?l?yor</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Sunucudan al?nan HTTP kodu yanl??. 201 bekleniyordu, ancak "%1 %2" al?nd?.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>%1 dosyas? yerel veri taban?ndan al?namad?</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>%1 dosya kayd? yerel veri taban?ndan silinemedi</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Sabitleme durumu ayarlan?rken sorun ??kt?</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>?st veriler veri taban?na yaz?l?rken sorun ??kt?</translation>
</message>
@@ -4571,22 +4683,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>?ifrelenmi? dosya y?klenemedi.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>%1 dosyas?, ad?n?n ba?ka bir dosya ile ?ak??mas? nedeniyle y?klenemedi, dosya adlar? aras?nda yaln?zca b?y?k k???k harf fark? var</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>%1 y?klemesi klas?r?n kotas?n? a??yor</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4594,11 +4695,6 @@
<translation>%1 dosyas?n?n de?i?tirilme zaman? ge?ersiz. Sunucuya y?klenmedi.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>Dosya kald?r?ld? (y?klemeyi ba?lat) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Yerel dosya e?itleme s?ras?nda de?i?mi?. S?rd?r?lecek.</translation>
@@ -4628,6 +4724,22 @@
<source>The file %1 is currently in use</source>
<translation>%1 dosyas? ?u anda kullan?l?yor</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>%1 y?klemesi klas?r?n kotas?n? a??yor</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>?ifrelenmi? dosya y?klenemedi.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>Dosya kald?r?ld? (y?klemeyi ba?lat) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4876,6 +4988,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>Sa? t?k men?s? payla??m?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>Sizinle bir ?ey payla?t?m</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>Payla??m se?enekleri</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>Ki?isel ba?lant?y? e-posta ile payla? ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>Ki?isel ba?lant?y? panoya kopyala</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>"%1" klas?r? ?ifrelenemedi</translation>
@@ -4883,7 +5021,7 @@
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="552"/>
<source>The account %1 does not have end-to-end encryption configured. Please configure this in your account settings to enable folder encryption.</source>
- <translation>%1 hesab?nda u?tan uca ?ifreleme yap?land?r?lmam??. Klas?r e?itlemesini kullanabilmek i?in l?tfen hesap ayarlar?n?zdan kullan?ma al?n.</translation>
+ <translation>%1 hesab?nda u?tan uca ?ifreleme yap?land?r?lmam??. Klas?r e?itlemesini kullanabilmek i?in l?tfen hesap ayarlar?n?zdan etkinle?tirin.</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="571"/>
@@ -4910,43 +5048,17 @@
<translation>?u klas?r ?ifrelendi: "%1"</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>Sa? t?k men?s? payla??m?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>Yeni konum se?in ?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>Sizinle bir ?ey payla?t?m</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>Payla??m se?enekleri</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>??lem</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>Ki?isel ba?lant?y? panoya kopyala</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>Ki?isel ba?lant?y? e-posta ile payla? ?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>Bu payla??mdan ayr?l</translation>
@@ -4962,11 +5074,6 @@
<translation>Bu klas?r yeniden payla??lamaz</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>?? ba?lant?y? kopyala</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>?ifrele</translation>
@@ -4993,12 +5100,6 @@
<translation><numerusform>%1 dakika sonra a??lacak</numerusform><numerusform>%1 dakika sonra a??lacak</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>Taray?c?da a?</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>?ak??may? ??z ?</translation>
@@ -5028,6 +5129,17 @@
<source>Delete</source>
<translation>Sil</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>?? ba?lant?y? kopyala</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>Taray?c?da a?</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5129,13 +5241,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>Bu ba?lant? ?ifrelenmemi? oldu?undan g?venli DE??L.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>Sunucu s?r?m?: %1</translation>
@@ -5155,6 +5260,13 @@
<source>The connection is not secure</source>
<translation>Ba?lant? g?venli de?il</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>Bu ba?lant? ?ifrelenmemi? oldu?undan g?venli DE??L.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5247,6 +5359,32 @@
<translation>%1 (?nceki bir sorun nedeniyle atland?, %2 i?inde yeniden denenecek)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>Yaln?zca %1 kullan?labilir, ba?latabilmek i?in en az %2 gerekli</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>Yerel e?itleme klas?r? a??lamad? ya da olu?turulamad?. E?itleme klas?r?ne yazma izniniz oldu?undan emin olun.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>Disk alan? azald?: Bo? alan? %1 de?erinin alt?na d???recek indirmeler atland?.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>Sunucu ?zerinde baz? y?klemeleri kaydetmek i?in yeterli alan yok.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>??z?lmemi? ?ak??ma.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>Dosya g?ncellenemedi: %1</translation>
@@ -5267,22 +5405,6 @@
<translation>Dosya kayd? yerel veri taban?na yap?lamad?: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>??z?lmemi? ?ak??ma.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>Yaln?zca %1 kullan?labilir, ba?latabilmek i?in en az %2 gerekli</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>Yerel e?itleme klas?r? a??lamad? ya da olu?turulamad?. E?itleme klas?r?ne yazma izniniz oldu?undan emin olun.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Sanal dosyalar son ek ile kullan?l?yor. Ancak son ek ayarlanmam??</translation>
@@ -5302,16 +5424,6 @@
<source>Cannot open the sync journal</source>
<translation>E?itleme g?nl??? a??lamad?</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>Disk alan? azald?: Bo? alan? %1 de?erinin alt?na d???recek indirmeler atland?.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>Sunucu ?zerinde baz? y?klemeleri kaydetmek i?in yeterli alan yok.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5322,7 +5434,7 @@
<translation>?evrim d???</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>Hizmet ko?ullar?n? kabul etmelisiniz</translation>
</message>
@@ -5609,7 +5721,7 @@
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="1082"/>
<source>Open Nextcloud Talk in browser</source>
- <translation>Taray?c?da Nextcloud Konu? uygulamas?n? a?</translation>
+ <translation>Taray?c?da Nextcloud Talk uygulamas?n? a?</translation>
</message>
</context>
<context>
@@ -5706,11 +5818,6 @@
<source>Less than a minute</source>
<translation>1 dakikadan az</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation><numerusform>%n dakika</numerusform><numerusform>%n dakika</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5718,20 +5825,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation><numerusform>%n saat</numerusform><numerusform>%n saat</numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1 dakika</numerusform><numerusform>%1 dakika</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation><numerusform>%n g?n</numerusform><numerusform>%n g?n</numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1 saat</numerusform><numerusform>%1 saat</numerusform></translation>
@@ -5746,6 +5843,21 @@
<source>%1 days</source>
<translation><numerusform>%1 g?n</numerusform><numerusform>%1 g?n</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation><numerusform>%n dakika</numerusform><numerusform>%n dakika</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n saat</numerusform><numerusform>%n saat</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n g?n</numerusform><numerusform>%n g?n</numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5888,6 +6000,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>L?tfen oturum a??n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>Herhangi bir e?itleme klas?r? yap?land?r?lmam??.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>%1 ile ba?lant? kesildi</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>Sunucu s?r?m? desteklenmiyor</translation>
@@ -5908,31 +6035,6 @@
<translation>Hesab?n?zdan %1 sunucunuzun hizmet ko?ullar?n? kabul etmeniz isteniyor. Hizmet ko?ullar? okuyup kabul etti?inizi onaylamak i?in %2 ?zerine y?nlendirileceksiniz.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>%1 ile ba?lant? kesildi</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>?u hesaplar?n ba?lant?s? kesildi:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>Hesap %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>L?tfen oturum a??n</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>Hesap e?itlemesi kullan?mdan kald?r?ld?</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5954,11 +6056,6 @@
<translation>%1 i?in macOS VFS: Bir sorun ??kt?.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>Herhangi bir e?itleme klas?r? yap?land?r?lmam??.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>Uzak "%1" ?zerindeki de?i?iklikler denetleniyor</translation>
@@ -5969,6 +6066,21 @@
<translation>Yerel "%1" ?zerindeki de?i?iklikler denetleniyor</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>?u hesaplar?n ba?lant?s? kesildi:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>Hesap %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>Hesap e?itlemesi devre d??? b?rak?ld?</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5977,11 +6089,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>&Yerel klas?r</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>Kullan?c? ad?</translation>
@@ -6017,22 +6124,11 @@
<translation>?undan b?y?k klas?rlerin e?itlenmesi i?in onay istensin</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>D?? depolama ayg?tlar?n?n e?itlenmesi i?in onay istensin</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>E?itlenecek ?geleri se?in</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>Yerel veriler korunsun</translation>
@@ -6047,6 +6143,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>Yerel klas?r silinsin ve temiz bir e?itleme ba?lat?ls?n</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>E?itlenecek ?geleri se?in</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>&Yerel klas?r</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6087,6 +6199,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%ng</numerusform><numerusform>%ng</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>gelecekte</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%ns</numerusform><numerusform>%ns</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1d</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>?imdi</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>Bir s?re ?nce</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6127,57 +6284,12 @@
<source>Synced %1</source>
<translation>%1 ?gesi e?itlendi</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%ng</numerusform><numerusform>%ng</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>gelecekte</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%ns</numerusform><numerusform>%ns</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>?imdi</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1d</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%nd</numerusform><numerusform>%nd</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>Bir s?re ?nce</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation>Dosya silinirken sorun ??kt?</translation>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>'#' karakteri ile ba?layan yollar VFS kipinde desteklenmez.</translation>
@@ -6339,7 +6451,7 @@
<message>
<location filename="../src/gui/filedetails/ShareView.qml" line="313"/>
<source>Sharing is disabled</source>
- <translation>Payla??m kullan?mdan kald?r?lm??</translation>
+ <translation>Payla??m devre d??? b?rak?lm??</translation>
</message>
<message>
<location filename="../src/gui/filedetails/ShareView.qml" line="320"/>
@@ -6349,7 +6461,7 @@
<message>
<location filename="../src/gui/filedetails/ShareView.qml" line="328"/>
<source>Sharing is disabled.</source>
- <translation>Payla??m kullan?mdan kald?r?lm??.</translation>
+ <translation>Payla??m devre d??? b?rak?lm??.</translation>
</message>
</context>
<context>
@@ -6370,7 +6482,7 @@
<message>
<location filename="../src/common/syncjournaldb.cpp" line="981"/>
<source>Failed to connect database.</source>
- <translation>Veri taban? ba?lant?s? kurulamad?.</translation>
+ <translation>Veritaban? ba?lant?s? kurulamad?.</translation>
</message>
</context>
<context>
@@ -6423,6 +6535,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>Yerel ya da grup klas?rlerini a?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>Yerel klas?r? a?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>Ba?lant? kuruldu</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>Ba?lant? kesildi</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>"%1" yerel klas?r?n? a?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>"%1" grup klas?r?n? a?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>Dosya gezgininde %1 a?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>Kullan?c? grup ve yerel klas?rler men?s?</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6612,16 +6767,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6636,6 +6781,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6869,16 +7024,16 @@
<translation>Kurulum s?ras?nda sorun ??kt?</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>E?itlemeye haz?rlan?l?yor</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>E?itleme durduruluyor</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>E?itlemeye haz?rlan?l?yor</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>E?itleme duraklat?ld?</translation>
@@ -6937,4 +7092,17 @@
<translation>Yerelden kald?r?p yer a?</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>H?zl? e?itleme kullan?ls?n</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>H?zl? e?itleme yaln?zca ke?fedilen klas?rlerdeki dosya ve klas?rler de?i?ikliklerini e?itler. B?ylece, sanal dosyalar?n ilk yap?land?rmas?ndaki yan?t verme h?z? ?nemli ?l??de art?r?labilir. Bununla birlikte, ke?fedilmemi? bir klas?re ta??nm?? dosyalar?n yeniden indirilmesine neden olur.</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_ug.ts nextcloud-desktop-3.16.6/translations/client_ug.ts
--- nextcloud-desktop-3.16.4/translations/client_ug.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_ug.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>??? ????????????? ????????</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>??? ??????????? ????? ??????????? ?????? ?????? ???????? ?????? ?? ?????? ????????????? ????????????? ?????????????. ?? ?????? ???????????? ???????? ???????????? ??????????????? ?????????? ???????????. ???????? ???????? ? ?? ???????????? ???????? ????????? ????????????? ?????? ???????? ??????????? ???????? ????????. </translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>?????? ??????????? ????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -557,7 +549,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>????? ???????</translation>
</message>
@@ -572,7 +564,7 @@
<translation>??????</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>????? ????????????? ???????????? ??????? ???????????.</translation>
</message>
@@ -580,33 +572,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>?????? ???????:?</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>????????????? ?????? ????????? ?????? ?????? ??????????????? <b> ?????????? </ b> ????? ? ?? ??????????? ????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>????? ?????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>???????? ?????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation><???????????> ????? <user> ?? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>??????? ???????????</translation>
@@ -637,6 +607,33 @@
<translation>??????? ???????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>???????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>?????? ???????:?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation><???????????> ????? <user> ?? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>??????? ??????????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>?????? ????????? ????? ?????????? ??????????????</translation>
@@ -671,9 +668,9 @@
<b> ?? ???????? ??????? ?????????? ????????. ??????????????? ????????? </b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>??????? ??????????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -686,6 +683,11 @@
<translation>Mnemonic ?? ????????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>?? ??????? ????? ?????????? ?????????????? ??????????</translation>
@@ -711,6 +713,12 @@
<translation>?????? ???????? ??? ??????? ??????? ???. ?? ?????? ???????? ?????????????? ??????????????? ??? ?????????????? ????? ?????? ??????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -735,12 +743,6 @@
<translation>?????? ???????? ?????????????? ? ????? ?? ?????? ?????? ?????? ?????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>?????? ???????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>????????</translation>
@@ -779,16 +781,6 @@
<translation>????????????? ????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>????????????? ??????? ????????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>????????????? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>?????? ?????? ????????????? ???????</translation>
@@ -814,21 +806,11 @@
<translation>?????? ?????? ????? ?????? ?????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p> ?????? ?????? ???????? ????????? <i>% 1 </i>. </p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>?????? ?????? ????????????? ???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p> ???????? <i>% 1 </i> ?????? ???????? ????????????? ?????????????? </p> <p> <b> ?????????: </b> ?? <b> ????? </b> ?????????? ?????????. </p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>?????? ?????? ?????????? ???????</translation>
@@ -862,24 +844,24 @@
<translation>????????? ?????????? ??????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>???????? ??????????????? ?????? ????? ? ??? ???? 12 ????? ?????? ?????? ????? ???????????????. ??????? ?????? ????? ????? ??????? ??????? ??????. ????? ????????????? (?????????? ???? ?????? ??????????????? ??????) ????? ???????????? ??????? ??????????? ??????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>????????? ?????????? ???????????????? ??????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>% 1 ??? ????????? ?????????? ???????????????? ???????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>????????? ?????????? ???????????????? ?????????? ??????????? ?????? ??? ???????? ??????????? ????????????. <br> ??????????? ????????? ????????????? ??????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -892,34 +874,44 @@
<translation>??????????? ????????? ????? ??????????. <br/> ???? ???????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>???????????????% 2 ???% 1 (% 3%). ????? ??????????? ???? ???????????? ??????????? ??? ?????? ?????? ???? ???????????? ????????? ?????? ??????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>???????????????% 1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>???????????????% 2 ???% 1</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>????? ?????? ???????? ?????? ???.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>???????% 1MB ??? ????? ?????? ????????? ???:% 2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>???????????????% 1</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>% 1 as% 2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>?? ????????? ????????? ?????????? ?????????????? ????? ??? ??????? ????? ??????????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>??????????? ???????% 1 ??????????! ?????????? ???????? ????? ??????????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>???????????????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>?? ??????? ?????????? ???????????????? ????????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -937,79 +929,125 @@
<translation>???????????% 1 ????? ?????? ????????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>???????????% 1 ??????? ????? ??????????????? ? ???? ??????????? ???????? ??????? ?????????.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>% 1 ??? ??????? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>% 1 ?? ?????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>??? ??? ???????? ???????????????? ?????? ????????? ???: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>% 1 ?? ???????????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>?????? ???????? ???????? ???????????????? ?????? ????????? ???: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>??????????? ?????? ????????:% 1 ????% 1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>??? ????????? ?????? ????????? ??? ? ????? ????? ??? ??? ???? ????? ????????: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>?????? ???????? ?????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>% 1 ??????? ??????????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>????????????? ??????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation type="unfinished"/>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>????????????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>??? ??? ???????? ???????????????? ?????? ????????? ???: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p> ?????? ?????? ???????? ????????? <i>% 1 </i>. </p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>?????? ???????? ???????? ???????????????? ?????? ????????? ???: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p> ???????? <i>% 1 </i> ?????? ???????? ????????????? ?????????????? </p> <p> <b> ?????????: </b> ?? <b> ????? </b> ?????????? ?????????. </p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>??? ????????? ?????? ????????? ??? ? ????? ????? ??? ??? ???? ????? ????????: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>???????? ??????????????? ?????? ????? ? ??? ???? 12 ????? ?????? ?????? ????? ???????????????. ??????? ?????? ????? ????? ??????? ??????? ??????. ????? ????????????? (?????????? ???? ?????? ??????????????? ??????) ????? ???????????? ??????? ??????????? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>???????% 1MB ??? ????? ?????? ????????? ???:% 2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>????????? ?????????? ???????????????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>?? ????????? ????????? ?????????? ?????????????? ????? ??? ??????? ????? ??????????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>% 1 ??? ????????? ?????????? ???????????????? ???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>?? ??????? ?????????? ???????????????? ????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>????????? ?????????? ???????????????? ?????????? ??????????? ?????? ??? ???????? ??????????? ????????????. <br> ??????????? ????????? ????????????? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>???????????????? ??????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>???????????????% 2 ???% 1 (% 3%). ????? ??????????? ???? ???????????? ??????????? ??? ?????? ?????? ???? ???????????? ????????? ?????? ??????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>???????????????% 2 ???% 1</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>????? ?????? ???????? ?????? ???.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>% 1 as% 2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>??????????? ???????% 1 ??????????! ?????????? ???????? ????? ??????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>???????????% 1 ??????? ????? ??????????????? ? ???? ??????????? ???????? ??????? ?????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>% 1 ?? ?????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>% 1 ?? ???????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>??????????? ?????? ????????:% 1 ????% 1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>% 1 ??????? ??????????.</translation>
</message>
</context>
<context>
@@ -1124,11 +1162,6 @@
<translation>????????? ?? ?????? (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>Browse?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>????????? ??????:</translation>
@@ -1139,6 +1172,11 @@
<translation>??????????? pkcs12 ??????? ??????? ????????? ???????????? ???????? ?????? ??????? ????????.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>Browse?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>????????? ??????</translation>
@@ -1189,34 +1227,34 @@
<translation>???????????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>% 1 ???????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 ???????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>% 1 ?????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 ?????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>????? ???????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1224,12 +1262,12 @@
% 3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>??????? ????????? ??????? ???????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>% 1 ???? ??????? ????????? ??????? ???????? ??????? ???????. ???????? ??????? ??????????? ???????? ??????? ??????? ?????????? ?????.</translation>
</message>
@@ -1271,6 +1309,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1278,6 +1355,11 @@
<translation>% 1 ????????? ???????? ???????? ? ????? ?????? ????????? ????? ?????? ??????</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>% 1 ????????? ???????????? ????? ??????????. ????????????? ????????.</translation>
@@ -1482,7 +1564,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>???????? ???? ?????? ??????? ??????? ???????</translation>
</message>
@@ -1612,21 +1694,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>????????? <i>% 1 </i> ?? ????????? ?????? ??????????? ???????? ?????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>???????? <i>% 1 </i> ???????? ?????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>????????? ????????????</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1642,30 +1709,30 @@
% 1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>Nextcloud ???????? ??????????</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>????????? <i>% 1 </i> ?? ????????? ?????? ??????????? ???????? ?????????????</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>???????? ????????: ?????????? ????? ???? ????? ????.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>???????? <i>% 1 </i> ???????? ?????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>????????? ????????????</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>?????</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>??????????? ??????? ????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>?? ??????? ????? ????????? ??????????? ??? ????</translation>
@@ -1675,16 +1742,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>??? ???? ????????????? ??????? ????????? ????? ????????.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>???????? ????????: ?????????? ????? ???? ????? ????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>Nextcloud ???????? ??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>??????????? ??????? ????? ?????</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>???????? ????????? ???????? ??????????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>% 1 ????????? ???????? ??????????? ???????</translation>
</message>
@@ -1692,19 +1774,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>??????????? ????????: PROPFIND ????? XML ??????? ?????!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>??????????? ???? ?????? ??????? ?????? ????????!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>??????????? ???? ?????? ??????? ?????? ????????: ?????????????? ???????? ????? ?????.</translation>
</message>
@@ -1712,27 +1794,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>?????????% 1 ?? ???????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>????????? ????????? ??????? ?????????? ? ??????? ??? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>????????? ?????????:% 1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>?????? ?????? ?????? ?????????? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>?????????% 1 ?? ????????? ???????</translation>
</message>
@@ -1972,11 +2054,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>????? ?????? ??????? HTTPS ??? ????????? ??????? ? ????? ?????? ??????? HTTPS ????? ???????????. ????? ?????? ????? ? ????? ?? ?????????? ???????? ?????? ??????. ????????????? ????? ???????????.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>??????????? ??????????? URL ??????? HTTPS ????? ????????? ??????? ? HTTPS ????? ??????????. ????? ?????? ????? ? ????? ?? ?????????? ???????? ?????? ??????. ????????????? ????? ???????????.</translation>
@@ -1988,28 +2065,33 @@
<translation>?????????????? ???????: <em>% 1 </em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>????? ?????? ??????? HTTPS ??? ????????? ??????? ? ????? ?????? ??????? HTTPS ????? ???????????. ????? ?????? ????? ? ????? ?? ?????????? ???????? ?????? ??????. ????????????? ????? ???????????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>??????? ??????? ??????? ??????? ??????? ???????: <br> <em>% 1 </em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>?????????????? ?????? ?????? JSON ?? ?????? ?????????: <br> <em>% 1 </em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>?????????????? ?????? ????? ?????? ???????????? ??????????? ??? ?????? ???????</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>?????????????? ?????? ?????? JSON ?? ?????? ?????????: <br> <em>% 1 </em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2052,6 +2134,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>% 1 ?????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>% 1 ?????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>% 1 ?? ???????????% 2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>% 1% 2 ?? ????????.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation type="unfinished"/>
@@ -2067,17 +2177,6 @@
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>% 1 ?????????.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -2093,33 +2192,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>% 1 ?????????.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>% 1 ?? ???????????% 2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>% 1% 2 ?? ????????.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2156,68 +2238,68 @@
<translation>??????????? ??????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>???????? ??????????? ??????????? ???????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>% 1 MB ??? ??? ?????? ???? ?????? ?????? ???????:% 2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>?????? ?????? ?????????? ?????? ?????? ???????.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>?????????? ???????? ??????????? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>?????? ??????????? ?????? ????????? ???????% 1MB ??? ????? ?????:% 2.
% 3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>????????????? ?????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>????????????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>% 1 ?????? ??????% 2MB ??? ?????? ????????? ?????????? ????? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>?? ?????? ???????? ????????????? ????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>% 1 ?????? ??????? ??????? ? ????? ??? ??????? ?????????????. ????? ???????? ?????? ?????????? ??? ??????? ????????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>% 1 ??????? ??????? ? ????? ??? ??????? ?????????????. ?? ??? ??????? ????????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2230,12 +2312,12 @@
% 1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>?????? ?????? ??????? ?% 1? ? ????? ?% 2? ?? ??????? ?????? ?% 3? ????? ?????? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2244,7 +2326,7 @@
???????? ????? ? '% 1' ?????? ?????????? ????????????? ?????? ???????? ?????????? ???????????? ????????? ??????? ?????????????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2253,22 +2335,22 @@
???????? ????? ? ?????????? ???????????? ????????? ?????????????? ??????? ??????? ?????????????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>?????? ??????????? ???????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>??????? ????? ?????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>??????????? ????????????? ??????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>?????????????? ??????????? ??????? ????????</translation>
</message>
@@ -2309,11 +2391,6 @@
<translation>?????? ?????? ???????? ??????? ????????????</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>???? ??? ???????? ?????? ?% 1? ??????? ? ????? ????????? ???????. ????? ????????? ??????????? ???????????? ?????????????????????? ????????????.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation> (????????)</translation>
@@ -2324,6 +2401,11 @@
<translation> (????????% 1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>???? ??? ???????? ?????? ?% 1? ??????? ? ????? ????????? ???????. ????? ????????? ??????????? ???????????? ?????????????????????? ????????????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>????????????? ?????.</translation>
@@ -2394,16 +2476,6 @@
<translation>??? ???????? ????? ???????? ??????????.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>??????????? ??????????.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>% 1 (??????????? ??????????)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation type="unfinished"/>
@@ -2450,6 +2522,16 @@
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.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>??????????? ??????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>% 1 (??????????? ??????????)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2493,16 +2575,6 @@
<translation>?????????????? ?????? ?????? ??????????? ????????????? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>?????????????? ?????? ?????? ??????????</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>??? ?????????? ?????????? ???. ??????????? ?????.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>?????? ?????? ?????? ????????? ??????????.</translation>
@@ -2544,16 +2616,31 @@
<translation>% 1% 2?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>% 1 / s ?? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>??????% 1 ???% 1</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>??? ?????????? ?????????? ???. ??????????? ?????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>% 1 / s ?? ???????</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>?????????????? ?????? ?????? ??????????</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2600,21 +2687,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>% 2 ???% 1 ?% 4 ???% 3</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>??????% 1 ???% 1</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>????????????? ??????????</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2774,11 +2856,6 @@
<translation>????????? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>& ??????? ?????????? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>??????? ??????????? ????????</translation>
@@ -2789,11 +2866,6 @@
<translation>??????? ??????? ?????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>& Monochrome ???????????? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation type="unfinished"/>
@@ -2809,17 +2881,32 @@
<translation>Advanced</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>???????? ?????? ???? ?????? ??????????? ?????????????? ????? ????????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>????? ?????????? ?????????????? ????? ?????????????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>& ??????? ?????????? ????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>& Monochrome ???????????? ????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>???????? ?????? ???? ?????? ??????????? ?????????????? ????? ????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>??? ???????? ?????? ????????? ??????????? ?????? ??? ???????? ????? ????????</translation>
@@ -2830,11 +2917,6 @@
<translation>?????? ????? ?????? ?????? ???????????? ???????????????? ?????????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>????? ?????????? ?????????????? ????? ?????????????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>?????????????? ??????????? ?????? ????????? ??????</translation>
@@ -2886,11 +2968,6 @@
<translation>??????? ???????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>& ????? ???????? && ???????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>?????????????? ?????????? ????????</translation>
@@ -2911,6 +2988,16 @@
<translation>????? ?????????</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>& ????? ???????? && ???????</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>?????? ??????? ????? ????????? ??????????? ?????????.</translation>
@@ -2931,6 +3018,11 @@
<translation>?????????? ?????????? ?????????????? ? ????? ??????? ?????? ?????????? ???????? ????????? ???????????.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>?????</translation>
@@ -3012,6 +3104,11 @@
<source>Debug archive is created at %1</source>
<translation>??????? ???????% 1 ?? ???????</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3176,102 +3273,97 @@
<translation>???? ?????? ?????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>????????? ?????? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>?% 1? ????????? ?????????????? ???????? ? ????? ??????? ?? ????????? ?????? ????????????? ??????? ???.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>????????? ????????? ????-?????????? ?????? ??????????: * "| &?,;: \ / ~ <> ???????? / ??? ?????? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>?% 1? ????????? ?????????????? ???????? ? ????? ?? ??????? ????????????? ?????? ????????????? ??????? ???.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>????????? ????????? ?????? ??????????:% 1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>????????? ??????? ?????????? ?????? ??????????:% 1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>????????? ?????? ????? ?????? ??????????:% 1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>????????? ?????? ?????????? ?????? ??????????:% 1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>????????? ?????? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>?? ????????? ?????? ????????? ????????? ???. ????????? ?????????? ??????? ??????????? ????? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>???????% 1 ????? ??????? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>?????? ????? ??????? ?? ??????? ?????? ??????????? ??? ?????? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>?????? ????? ??????? ???????? ??? ?????? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>?????? ?????? ??? ?????? ??????? ???.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>?????????? ????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>?????? ????? ???????? ????????? ??? ?????? ??????:% 1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>????????? ?????? ?????????????. ????????????? ????????????????? ????????????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>????????? ??????? ??????????? ???????? ? ????? ?????? ????????? ?????? ????????????? ??????. ????? ??????? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>?????? ????????? ?????? ?????????????. % 1</translation>
</message>
@@ -3395,16 +3487,6 @@
<translation><p>% 1 ?????????? ???? ????? ???. </p> <p> <b>% 2 </b> ????????? ??????. ?????????? ?????% 3. </p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>?? ????? ??????</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>????????? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>??????? ?????? ?????</translation>
@@ -3429,6 +3511,16 @@
<source>Update manually</source>
<translation>????? ???????</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>?? ????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>????????? ???????</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3453,6 +3545,23 @@
<translation>????????? ??????????? ?????????? ????? ??????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>??? ???????? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes / s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>?????????: ????????? ???????????? localhost ???? ?????????? ????????? ?????? ???</translation>
@@ -3475,46 +3584,29 @@
<translation>??????? ???????????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>??? ???????? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>????????? ???</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes / s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>???</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>?????????? ??? ????????? 3/4 ??????? ??? ?????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>??? ???????? ??????</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>?????????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>??? ???????? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>????????? ?????????????? ??? ?????</translation>
@@ -3543,6 +3635,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>???? ?????????????? ????????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>??????? ?????????????? ?????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>????% 1 ??????? ??????</translation>
@@ -3573,11 +3675,6 @@
<translation>????????? ???????????. ????????? ????? ??????? ?????% 1 ?? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>???? ?????????????? ????????????.</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>????% 1 ?? ?????????? ??????. ????????? ??????? ????? <a href = '% 2'>% 2 </a> ?? ?????.</translation>
@@ -3588,16 +3685,21 @@
<translation>????% 1 ?? ?????????? ??????. ????????? ??????? ?????% 2 ?? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>??????? ?????????????? ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>??????? ?????? ???????: ???? ?????????????? ?????????????.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>????????? ??????? ???. ??????? ??? ???? ???????.</translation>
@@ -3773,11 +3875,6 @@
<translation><font color = "green"> ??????????????? ?????% 1:% 2 ?????% 3 (% 4) </font> <br/> <br/> ?? ??????????????? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>?????????? URL</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>% 2 ??% 1 ?? ???????????: <br/>% 3</translation>
@@ -3788,6 +3885,16 @@
<translation>% 2 ??% 1 ?? ????????? ?????? ?????.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>??????????? ????????? ?????????. ??????? ??????? ????? ??????????? ???????????? ????? ? <a href = "% 1"> ?? ????? ????? </a> ??????????? ????? ??????????? ??????? ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>?????????? URL</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>% 2 ??% 1 ?? ????????? ???????????</translation>
@@ -3798,11 +3905,6 @@
<translation>????????????? ??????????? ????? ?% 1? ?? ????????. URL ????? ? ??????????? ???? ????????.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>??????????? ????????? ?????????. ??????? ??????? ????? ??????????? ???????????? ????? ? <a href = "% 1"> ?? ????? ????? </a> ??????????? ????? ??????????? ??????? ?????.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>??????????? WebDAV ???????? ?????????? ????? ?????</translation>
@@ -4014,62 +4116,34 @@
<translation>??? ?????? ????? ??????????? ?????? ??????? ?? ?????? ??????????? ??????????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>?????? ??????</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>??????</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>?? ?????? ??????????? "% 2" ?????? ??? ?????? ??????% 1 ????? ??????????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>% 1 ????? ??? ??????? ??? ?????????? ?????? ??? ?????? ??????</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>% 1 ????? ?? ?????? ??????????? ????????? ?????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>?????? ????? ??? ??????? ??? ?????????? ?????? ??? ?????? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
@@ -4079,6 +4153,24 @@
<translation>?????? ?????? ??? ?????? ??????? ???.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>?????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>?? ?????? ??????????? "% 2" ?????? ??? ?????? ??????% 1 ????? ??????????.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4087,6 +4179,16 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>% 1 ????? ??? ??????? ??? ?????????? ?????? ??? ?????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>% 1 ????? ?? ?????? ??????????? ????????? ?????.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>?????? ????? ??????? ???????? ??? ?????? ??????.</translation>
@@ -4177,64 +4279,74 @@
<translation>???????????% 1 ?? ?????? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>????????? ????? ?????????? ???????? ??????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>?????? ???????????? ? ????? ?? ?% 1? ?? ?????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>????????? ?????? ??????????% 1 ?????????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>?????????? ??????? ???????? ? ??????? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>?????????????? ??????? ???? ???????? ????????? ???????? ????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>?????? ?????????? ? ????? ?? ???????? ?????? ?????? ?????? ??????? ??????? ???</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>?????? ?????????? ? ????? ?? ?????? ???????? ?????? ????? ????????? ???</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>?? ???????? ???????? ???????? ? ????? ?? ????? ??????????????? ???????? ? ??????? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>????????????? ? ??????? ?????????? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>???????? ????????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>??????????? ?% 1? ????????????? ????????? ??????? ????? ????? ?????:% 2</translation>
</message>
@@ -4242,38 +4354,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>????????? ????? ?????????? ???????????? ???? ?????? ????????? ????????? ??????? ???</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>% 1 ?????? ???????? ????????? ????????:% 2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>???? ?????? ????????? ????????? ???????:% 1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>?????? ????? ???????????????</translation>
</message>
@@ -4291,12 +4403,6 @@
<translation>???????? ?????? ??? ????????% 1 ???????? ????????? ????????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>?????? ???????????? ????? ????????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4353,6 +4459,12 @@
<source>The file %1 is currently in use</source>
<translation>% 1 ??????? ????? ???????????????</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>?????? ???????????? ????? ????????</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4370,39 +4482,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>% 1 ???????? ??????????? ? ???????:% 2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>?????? ?????? ???? ?????? ?????? ????? ??????? ?????????% 1 ?????? ???????? ??????? ????????!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>% 1 ?????? ?????? ?????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>% 1 ?????? ???????? ????????? ????????:% 2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>???? ?????? ????????? ????????? ???????:% 1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>% 1 ??????? ????? ???????????????</translation>
</message>
@@ -4415,14 +4527,14 @@
<translation>?????? ?????? ????? ??????? ?????????% 1 ?? ???????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>?????? DB ??? ?????? ??????????% 1 ???????????</translation>
</message>
@@ -4430,49 +4542,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>?????? ?????? ???? ?????? ?????? ????? ??????? ?????????% 1 ?????? ????????? ?????? ??????????? ????????!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>??????% 1 ????????? ? ????? ?????? ?????? ????? ????????? ???????? ???????!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>Pin ???????? ???????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>???? ?????? ????????? ????????? ???????:% 1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>% 1 ??????? ????? ???????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>?????? ?????? ????????? ?????? ?????? ?????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>????????? ?????? ????????? ?????? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>?????? DB ??? ?????? ??????????% 1 ???????????</translation>
</message>
@@ -4529,39 +4641,39 @@
<translation>% 1 ???% 2 ?? ????????????? ? ???????:% 3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>???? ?????? ????????? ????????? ???????:% 1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>% 1 ??????? ????? ???????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>??????????? ????????? ??????????? ???? HTTP ????. ???????????? 201 ? ????? ?% 1% 2? ?? ???????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>?????? DB ??? ?????? ??????????% 1 ???????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>Pin ???????? ???????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>???????? ???? ?????? ??????? ??????? ???????</translation>
</message>
@@ -4569,22 +4681,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>??????????? ???????? ????????????.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>% 1 ????????? ???????? ???????? ? ????? ?????? ????????? ????? ?????? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>% 1 ??? ????????? ?????? ????????? ???????? ????? ?????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4592,11 +4693,6 @@
<translation>% 1 ????????? ????????? ????? ??????????. ????????????? ????????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>?????? ????????? (???????? ??????)% 1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>??????????? ????????? ?????? ?????? ????????. ?? ??????? ??????.</translation>
@@ -4626,6 +4722,22 @@
<source>The file %1 is currently in use</source>
<translation>% 1 ??????? ????? ???????????????</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>% 1 ??? ????????? ?????? ????????? ???????? ????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>??????????? ???????? ????????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>?????? ????????? (???????? ??????)% 1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4874,6 +4986,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>?????? ????????? ???????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>??? ??? ????? ??? ????? ????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>??????????? ????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>???????????? ??? ???????? ?????? ??????? ????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>?????? ????????? ?????? ????????? ???????</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>?% 1? ???? ?????? ???????? ?????????????? ?????? ?????.</translation>
@@ -4908,43 +5046,17 @@
<translation>????????? ?????? ?????? ??????????????? ??????????: "% 1"</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>?????? ????????? ???????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>???? ??????? ???????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>??? ??? ????? ??? ????? ????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>??????????? ????????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>?????????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>?????? ????????? ?????? ????????? ???????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>???????????? ??? ???????? ?????? ??????? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>?? ??????? ????????</translation>
@@ -4960,11 +5072,6 @@
<translation>?? ?????? ???????? ????? ?????????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>????? ????????? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>????????</translation>
@@ -4991,12 +5098,6 @@
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>?????????? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>?????????? ??? ??????</translation>
@@ -5026,6 +5127,17 @@
<source>Delete</source>
<translation>?????</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>????? ????????? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>?????????? ?????</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5127,13 +5239,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>??????????????? ?? ??????? ??????? ?????.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>??????????? ???????:% 1</translation>
@@ -5153,6 +5258,13 @@
<source>The connection is not secure</source>
<translation>??????? ??????? ?????</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>??????????????? ?? ??????? ??????? ?????.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5245,6 +5357,32 @@
<translation>% 1 (????????? ??????? ????????? ?????? ????? ????? ?% 2 ?? ????? ?????)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>?????% 1 ??? ? ?????? ????? ??? ???????% 2 ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>?????? ??????????? ????????? ??????? ???? ?????????. ??????????? ????????? ????? ???????????? ???-????????? ????????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>????? ??????? ?????:% 1 ??? ????? ???????? ???????????? ?????????? ?????? ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>????????????? ???? ????????? ????? ???????? ?????? ???.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>??? ?????????? ???????.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>???????? ?????????????:% 1</translation>
@@ -5265,22 +5403,6 @@
<translation>?????? DB:% 1 ?? ?????? ?????????? ????????????</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>??? ?????????? ???????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>?????% 1 ??? ? ?????? ????? ??? ???????% 2 ?????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>?????? ??????????? ????????? ??????? ???? ?????????. ??????????? ????????? ????? ???????????? ???-????????? ????????????.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>??????? ?????? ????? ?????? ??????????? ???????? ? ????? ????????? ????????????</translation>
@@ -5300,16 +5422,6 @@
<source>Cannot open the sync journal</source>
<translation>??? ???????? ???????? ??????? ????????</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>????? ??????? ?????:% 1 ??? ????? ???????? ???????????? ?????????? ?????? ?????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>????????????? ???? ????????? ????? ???????? ?????? ???.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5320,7 +5432,7 @@
<translation>??????</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
</message>
@@ -5704,11 +5816,6 @@
<source>Less than a minute</source>
<translation>??? ??????? ???????? ?????</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5716,20 +5823,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5744,6 +5841,21 @@
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5886,6 +5998,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>??? ???????? ?????? ?????? ???????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>% 1 ??? ????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>????????????? ??????????? ???????</translation>
@@ -5906,31 +6033,6 @@
<translation>???????????% 1 ?????????????????? ????????? ?????????? ????? ??????????? ????? ??????. ???? ?????????????? ?? ??????? ????????????????? ??????? ????? ?????% 2 ?? ????? ????????????.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>% 1 ??? ????????</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>?????????? ????????:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>???????% 1:% 2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>??????????</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>??????? ??????????? ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5952,11 +6054,6 @@
<translation>% 1 ????? macOS VFS: ?????? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>??? ???????? ?????? ?????? ???????????.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>????????? ?% 1? ???? ????????????? ????????</translation>
@@ -5967,6 +6064,21 @@
<translation>?????? ?% 1? ???? ????????????? ????????</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>?????????? ????????:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>???????% 1:% 2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>??????? ??????????? ?????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>% 1 (% 2,% 3)</translation>
@@ -5975,11 +6087,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>& ?????? ?????? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>?????????? ?????</translation>
@@ -6015,22 +6122,11 @@
<translation>???????? ??? ?????? ??????????? ?????????????? ????? ?????</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>????? ?????????? ?????????????? ????? ?????</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>????????????? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>?????? ?????? ???????????? ??????</translation>
@@ -6045,6 +6141,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>?????? ?????? ???????? ??????? ????? ????????????? ??????</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>????????????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>& ?????? ?????? ??????</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6085,6 +6197,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>?????????</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1m</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>?????</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>??? ?????? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>% 1:% 2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6125,57 +6282,12 @@
<source>Synced %1</source>
<translation>??? ???????% 1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>?????????</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>?????</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1m</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>??? ?????? ???????</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>% 1:% 2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>VFS ??????? '#' ??????? ????????? ???????? ??????????.</translation>
@@ -6421,6 +6533,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>?????? ???? ??????? ?????? ???????????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>?????? ?????? ???????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>??????? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>?????? ?????? ???????? ????? "% 1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>??????? ?????? ????????? ????? "% 1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>?????? ???????????% 1 ?? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>?????????? ????????? ?? ?????? ?????? ?????? ?????????</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6610,16 +6765,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>% L1 B.</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>% L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>% L1 GB</translation>
@@ -6634,6 +6779,16 @@
<source>%L1 KB</source>
<translation>% L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>% L1 B.</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>% L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6867,16 +7022,16 @@
<translation>?????? ????????? ??????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>????????????? ????????? ????????</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>????????????? ????????</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>????????????? ????????? ????????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>??????????? ??????????</translation>
@@ -6935,4 +7090,17 @@
<translation>?????? ???????? ?????? ?????</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>??? ????????????? ????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>??? ??????????? ????? ??????????? ?????? ?????? ???????? ?????? ?? ?????? ????????????? ????????????? ?????????????. ?? ?????? ???????????? ???????? ???????????? ??????????????? ?????????? ???????????. ???????? ???????? ? ?? ???????????? ???????? ????????? ????????????? ?????? ???????? ??????????? ???????? ????????. </translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_uk.ts nextcloud-desktop-3.16.6/translations/client_uk.ts
--- nextcloud-desktop-3.16.4/translations/client_uk.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_uk.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>????????? ?????? ?????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>?????? ????????????? ????????? ???????????????? ?????? ????? ? ?????? ?? ????????????, ?? ????????? ? ?????????, ??? ???? ????????. ?? ??????? ?????? ?? ??? ??????? ??? ??? ??????????? ???????????? ??????????? ??????. ?????, ?? ????? ???????? ?? ?????? ?????????? ??????, ??? ???? ?????????? ?? ?????????, ??? ?? ???????????? ??????.</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>????????? ????????? ??????????? ??????</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation>????????? ??????????? ??'????? ?? ??????</translation>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -558,7 +550,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>?????? ?? ??????????? ??????????</translation>
</message>
@@ -573,7 +565,7 @@
<translation>??????????</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>?? ??????? ??????????? ???? ?????????? ?????? ? ??????????? ???????, ?? ??? ????????? ??????.</translation>
</message>
@@ -581,33 +573,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>????? ???????: ...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>??????????? ???????? ???? <b>????????</b> ? ????? ???????, ???? ?????? ?? ??????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>?????????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>???????????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>?????????? ?? <server> ?? <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>?????????????? ???</translation>
@@ -638,6 +608,33 @@
<translation>???????????? ?'???????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>???????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>????? ???????: ...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>?????????? ?? <server> ?? <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>????????? ????? ?? ???????????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>????????? ?????????? ??? ??????????? ??????</translation>
@@ -672,9 +669,9 @@
<b>?? ??? ????????? ???? ????????? ?????. ???????????</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>????????? ????? ?? ???????????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation>????????? ???????????? ??????????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -687,6 +684,11 @@
<translation>??????????? ???????? ?????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation>??????????? ??????????. ???'?????? ?? ???????? <b>???????????</b> ???????, ???? ??? ?????, ??? ???? ?????? ?? ????? ????????, ???? ????????? ???????????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>????????? ?????????? ????????? ??? ????? ?????????? ??????</translation>
@@ -712,6 +714,12 @@
<translation>???????? ???????? ??? ??? ????????????? ????????. ?????????? ???? ???????? ???? ???????? ???? ????? ????????? ?????????? ?????????????.</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation>?? ?? ?????? ??????????? ??? ???????, ???????? ????????? ?????????? ?? ?? ??????????? ?? ????? ????????. ?? ??????????? ?? ??? ??? ??????</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -736,12 +744,6 @@
<translation>?? ??????? ??????????? ???????, ???????? ????? ??????? ?????? ?? ?????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>???????? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>?????????</translation>
@@ -780,16 +782,6 @@
<translation>????????????? ?????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>?????????? ?????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>??????????? ?????????????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>???????? ????????????? ??? ????? ????????</translation>
@@ -815,21 +807,11 @@
<translation>?? ??????? ???????? ???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>????????? ???????? ??????? ?? ???????? <i>%1</i>.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>??????????? ?????????? ????????????? ??? ????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>?????? ???????? ????????????? ???????? <i>%1</i>?</p><p><b>????????:</b> ?? <b>??</b> ???????? ?? ????????? ??????.</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>???????? ????????????? ??? ????? ????????</translation>
@@ -863,24 +845,24 @@
<translation>???????? ????? ??? ??????????? ??????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>??? ??????? ????? ??????????????? ???????????? ?? ?????????? ?? ????????? ?????? ?? 12 ??????????? ????. ???? ?????, ????????? ?? ????? ?? ????????? ? ?????????? ?????. ???? ?????? ???????? ??? ????????? ????? ????????? ?? ?????? ?????????? ?????? (?????????, ????????? ??? ????????).</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation>??? ??????? ????? ??????????????? ???????????? ?? ???? ??????????? ????????? ?????? ? 12 ??????????? ????. ???????? ?? ?? ????????? ? ????????? ?????. ??? ???????? ???? ??????????? ????????????? ?????????? ????????? ?? ????? ?????????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>???????? ????????? ??????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation>?????? ????????? ?????????? ?? ????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>?? ???????? ?????????? ??? %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation>?? ????????? ???????????? ??????????? ?????????? ??? %1 ?? ????? ????????? </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>?????????? ??????????? ?????????? ???????? ?? ????????? ??????, ?? ???? ??????????? ?? ??? ???? ????????? ?? ?????? ????????.<br>??????????? ????? ?????????????? ?? ???????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation>???? ????????? ????????? ?????????? ?? ???????? ?? ????????? ???????? ????? ?? ???? ???????????? ?????? ?? ????? ????????. <br> ?????, ??????????? ????? ?????????? ?? ??????? ?? ???? ????? ????? ?????????, ?? ???? ???????????.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -893,34 +875,44 @@
<translation>??????????? ????????? ?????????????.<br/>??????? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>???????????????? %1 (%3%) ? %2. ?????? ????????, ??????? ? ?????????? ??? ?????????, ?????? ???? ???? ?????????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 ????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>???????????????? %1 ? %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>????????? ?????????? ?? ?????? ???????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>?? ????? ??? ????? ?????????? ??? ?????????? ???????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>???????? %2 ?????????, ?????? ???? ?????????? ???? ???????????? ?????????? %1MB</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 ????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation>????????? ?????????? ???? ?????????????? ??? ????? ??????????? ?? ?????? ????????.<br>???????? ???????? ????? ??? ????????????? ????????? ???? ?? ????? ????????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 ?? %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>??? ????? ?????????? ?????? ????????? ????????? ?????????? ?? ?????? ????????.<br>???? ????? ????? ????????? ?? ????? ???????? ????? ???????? ????? ????????? ?????.<br>?? ????? ??????? ????????????? ????????? ???????????? ?????????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>?????? ??????? %1 ?? ?????????????! ??????????? ???????? ????????????????? ?? ??? ?????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation>??? ????????? ????? ????????? ????????? ??????????, ??? ???? ???????? ????? ???? ???????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>???????????? ??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>??? ????????? ????? ????????? ?????????? end-to-end</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -938,79 +930,125 @@
<translation>?????? %1 ????????? ? ?????? ??????????????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>?????? ?????? ?? ?????? %1 ????????????????? ??? ???? ?'??????? ???????????? ????? ???????? ????? ?? ??????.</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>?????? ? ?????????? ?????? %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>?'??????? ? %1...</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>?????? ???????? ?? ???? ??????????????, ???????? ????? ?????? ?????????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>?? ??????? ?'???????? ?? %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>?????? ???????? ?? ???? ??????????????, ???????? ???? ????????? ? ????????? ????????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>??????? ? ???????????? ???????: %1, ???. %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>?????? ???????? ?? ???? ??????????????, ???????? ????? ?????? ????????? ??? ????????? ? ????????? ????????:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>?? ????? ???????? ????? ???????????? ???????? %1.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>???????? ???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>??????? %1 ??????????? ?? ???????????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>?????????? ?????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>????????? ?????????? ?? ?????? ???????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>??????????? ?????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>?????? ???????? ?? ???? ??????????????, ???????? ????? ?????? ?????????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>????????? ???????? ??????? ?? ???????? <i>%1</i>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>?????? ???????? ?? ???? ??????????????, ???????? ???? ????????? ? ????????? ????????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>?????? ???????? ????????????? ???????? <i>%1</i>?</p><p><b>????????:</b> ?? <b>??</b> ???????? ?? ????????? ??????.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>?????? ???????? ?? ???? ??????????????, ???????? ????? ?????? ????????? ??? ????????? ? ????????? ????????:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>??? ??????? ????? ??????????????? ???????????? ?? ?????????? ?? ????????? ?????? ?? 12 ??????????? ????. ???? ?????, ????????? ?? ????? ?? ????????? ? ?????????? ?????. ???? ?????? ???????? ??? ????????? ????? ????????? ?? ?????? ?????????? ?????? (?????????, ????????? ??? ????????).</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>???????? %2 ?????????, ?????? ???? ?????????? ???? ???????????? ?????????? %1MB</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>???????? ????????? ??????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>??? ????? ?????????? ?????? ????????? ????????? ?????????? ?? ?????? ????????.<br>???? ????? ????? ????????? ?? ????? ???????? ????? ???????? ????? ????????? ?????.<br>?? ????? ??????? ????????????? ????????? ???????????? ?????????.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>?? ???????? ?????????? ??? %1?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>??? ????????? ????? ????????? ?????????? end-to-end</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>?????????? ??????????? ?????????? ???????? ?? ????????? ??????, ?? ???? ??????????? ?? ??? ???? ????????? ?? ?????? ????????.<br>??????????? ????? ?????????????? ?? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>???????????? ??????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>???????????????? %1 (%3%) ? %2. ?????? ????????, ??????? ? ?????????? ??? ?????????, ?????? ???? ???? ?????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>???????????????? %1 ? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>?? ????? ??? ????? ?????????? ??? ?????????? ???????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 ?? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>?????? ??????? %1 ?? ?????????????! ??????????? ???????? ????????????????? ?? ??? ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>?????? ?????? ?? ?????? %1 ????????????????? ??? ???? ?'??????? ???????????? ????? ???????? ????? ?? ??????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>?'??????? ? %1...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>?? ??????? ?'???????? ?? %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>??????? ? ???????????? ???????: %1, ???. %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>?? ????? ???????? ????? ???????????? ???????? %1.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>??????? %1 ??????????? ?? ???????????.</translation>
</message>
</context>
<context>
@@ -1125,11 +1163,6 @@
<translation>?????????? ?? ???? (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>????????...</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>?????? ???????????:</translation>
@@ -1140,6 +1173,11 @@
<translation>??????????? ???????????? ???????? ????? ????????????? ?????? pkcs12 ? ???????????????? ?????.</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>????????...</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>??????? ??????????</translation>
@@ -1190,34 +1228,34 @@
<translation>??????????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 ????????? ???????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 ????????? ?????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 ?????????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 ???????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>?????? ?????????? ???????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1225,12 +1263,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>??????? ??????? ?? ????? ????????????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>???????? ??????? ??? ??? ????????? ??????? ?? ????? ???????????? ? %1. ???? ?????, ??????????????, ?? ????????? ?????? ?? ????? ? ?????????? ?????????? ??????.</translation>
</message>
@@ -1272,6 +1310,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation>???? ???? ??????? ????? ?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation>????????? ???????? ????? %1 ? ???? ????? ?? ????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation>???? %1 ???? ??????????, ???????? ??? ?? ? ???????????!</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation>?? ??????? ???????? ???? %1 ? ???? ????? ?? ????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation>????????? ?????????? ???? %1, ???????? ???????? ?????????? ???? ??????????. </translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation>??????? ? ?????????? ?????????: %1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation>???? %1 ????? ???????????????</translation>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1279,6 +1356,11 @@
<translation>????????? ??????????? ???? %1, ???????? ????? ???? ? ????? ??'??, ??? ? ????? ????????, ??? ?????.</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation>???? ??????? ??????? ??????? ?? ??????? ??/??? ?????????? ????? ?? ???? ????????? ?????????????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>???? %1 ??? ??????????? ??? ???????????. ?? ???????????? ???? ?? ??????.</translation>
@@ -1483,7 +1565,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>??????? ?? ??????? ????????? ?? ???? ?????</translation>
</message>
@@ -1613,21 +1695,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>?? ???????? ??????? <i>%1</i> ?? ???? ???? ????? ??????????</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>?? ???????? ???? <i>%1</i> ??????????</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>??????????? ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1643,30 +1710,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>????????? ????? Nextcloud ?? ???????????</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>?? ???????? ??????? <i>%1</i> ?? ???? ???? ????? ??????????</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>??????? ???????????: ??????????? ??????? ??'? ??????????? ??? ??????.</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>?? ???????? ???? <i>%1</i> ??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>??????????? ?????????</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>??? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>??????? ???? ?? ?????</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>???????????? ?????? ???????? ??? ????? ???????</translation>
@@ -1676,16 +1743,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>???? ?????, ??????? ?????? ?? ????????? ?????? ?? ?????????????? ??????.</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>??????? ???????????: ??????????? ??????? ??'? ??????????? ??? ??????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>????????? ????? Nextcloud ?? ???????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>??????? ???? ?? ?????</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>??????? ??? ??? ?????????? ????????? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>??????? ??? ??? ?????????? ????????? ????? %1</translation>
</message>
@@ -1693,19 +1775,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>??????? ???????: PROPFIND reply is not XML formatted!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>??????? ? ????????????? ?????????? ?????????!</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>??????? ??? ??? ???????????? ???????????? ?????????: ????????? ?????????, ???????? ??? ???????, ? ?????????.</translation>
</message>
@@ -1713,27 +1795,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>??????? ??? ??? ????????? ???????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>??????? ??????????? ?? ??????? - ?????? ??????????.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>??????? ?? ????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>?????????? ????????? ????? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>??????? ??? ??? ??????? ???????? %1</translation>
</message>
@@ -1973,11 +2055,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>URL, ???? ??????????, ?? ??????????? ? HTTPS, ???? URL ???????? ????? ???????????. ????????? ????????????, ???????? ?? ???? ????????? ???????? ? ????????. ???? ?????, ???????????? ? ???????????????.</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>URL ????????, ???? ???????? ??????, ?? ??????????? ? HTTPS, ???? URL ???????? ????? ???????????. ????????? ????????????, ???????? ?? ???? ????????? ???????? ? ????????. ???? ?????, ???????????? ? ???????????????.</translation>
@@ -1989,28 +2066,33 @@
<translation>?????? ???????? ???????: <em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>URL, ???? ??????????, ?? ??????????? ? HTTPS, ???? URL ???????? ????? ???????????. ????????? ????????????, ???????? ?? ???? ????????? ???????? ? ????????. ???? ?????, ???????????? ? ???????????????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>??????? ??? ??? ????????? ??????? ?? ???????? ????? "??????": <br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>????????? ???????? JSON, ???? ???????? ??????: <br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>????????? ??????? ?? ??????? ??? ????????? ????</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation>????????? ??? ??????? ?? ??????? ??? ????????? ????: <br><em>%1</em></translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>????????? ???????? JSON, ???? ???????? ??????: <br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2053,6 +2135,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 ????????????? ?? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 ?????????? ? %2.</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation><numerusform>%1 ?? %n ???? ???? ????????.</numerusform><numerusform>%1 ?? ?? %n ????? ???? ????????.</numerusform><numerusform>%1 ?? ?? %n ?????? ???? ????????.</numerusform><numerusform>%1 ?? ?? %n ?????? ???? ????????.</numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>???????? ???? ????????????. ??????? %1 ?????????.</translation>
@@ -2068,17 +2178,6 @@
<translation>???????? ???? ????????????. ??????? %1 ????????? ?????????.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 ?? ?? %n ???? ???? ????????.</numerusform><numerusform>%1 ?? ?? %n ????? ???? ????????.</numerusform><numerusform>%1 ?? ?? %n ?????? ???? ????????.</numerusform><numerusform>%1 ?? ?? %n ?????? ???? ????????.</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ????????.</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 ???? ???? ??????</numerusform><numerusform>%1 ?? %n ???? ????? ???? ??????</numerusform><numerusform>%1 ?? %n ????? ?????? ???? ??????</numerusform><numerusform>%1 ?? %n ????? ?????? ???? ??????</numerusform></translation>
@@ -2094,33 +2193,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 ?? ?? %n ???? ???? ????????.</numerusform><numerusform>%1 ?? ?? %n ????? ???? ????????.</numerusform><numerusform>%1 ?? ?? %n ?????? ???? ????????.</numerusform><numerusform>%1 ?? ?? %n ?????? ???? ????????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ????????.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ???? ????????????? ?? %2 ?? ?? %n ????? ???? ???? ?????????????.</numerusform><numerusform>%1 ???? ????????????? ?? %2 ?? ?? %n ????? ????? ???? ?????????????.</numerusform><numerusform>%1 ???? ????????????? ?? %2 ?? ?? %n ????? ?????? ???? ?????????????.</numerusform><numerusform>%1 ???? ????????????? ?? %2 ?? ?? %n ????? ?????? ???? ?????????????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 ????????????? ?? %2</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 ???? ?????????? ?? %2 ?? ?? %n ????? ???? ???? ??????????.</numerusform><numerusform>%1 ???? ?????????? ?? %2 ?? ?? %n ????? ????? ???? ??????????.</numerusform><numerusform>%1 ???? ?????????? ?? %2 ?? ?? %n ????? ?????? ???? ??????????.</numerusform><numerusform>%1 ???? ?????????? ?? %2 ?? ?? %n ????? ?????? ???? ??????????.</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 ?????????? ? %2.</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2157,68 +2239,68 @@
<translation>?????? ?????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>????????? ????????? ?????????? ????????? ????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>?????? ????? ???????, ????? ????? ?????? %1 ??: %2.
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>?????? ??????? ?? ??????????? ???????
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>???? ?????, ????????? ? ?????????????, ??? ??????? ?? ??? ?????????? ???????????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>??????? %2 ????????? ??????????? ????????? ?? ?????? %1MB
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>???????? ?????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>??????? %1 ????????? ??????????? ????????? ?? ?????? %2MB.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>??????????? ????????????? ????? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>??????? %1 ????????, ??? ???? ?????? ???? ????????? ? ?????????????. ???? ????????? ????? ???????? ?? ???? ??????????????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>???? %1 ???? ????????, ??? ?????? ????????? ? ?????????????. ??? ???? ?? ???? ??????????????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2231,12 +2313,12 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>??????? ???????????? ??????????? ?????: ??? "%1", ?????? "%2", ???????????? ??? ??????? "%3"</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2245,7 +2327,7 @@
????????????? ?? ?????? ????????? ??? ???????? ????? ?????? ??????????? ? ???????? "%1" ?? ?????? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2254,22 +2336,22 @@
????????????? ?? ?????? ????????? ??? ???????? ????? ?????? ??????? ?????????? ? ??????? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>?????? ???????? ??? ??????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>?????? ????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>????????? ????? ?? ???????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>????????? ????? ? ???????</translation>
</message>
@@ -2310,11 +2392,6 @@
<translation>?? ??????? ??????? ???? ????????</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>???????? ??????????? ?????? ????????????? "%1", ????? ????????? ???? ????????. ??????????????, ?? ?????? ?? ??????????? ???? ?? ???????????? ?????.</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>(???????? ?????)</translation>
@@ -2325,6 +2402,11 @@
<translation>(???????? ????? %1)</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>???????? ??????????? ?????? ????????????? "%1", ????? ????????? ???? ????????. ??????????????, ?? ?????? ?? ??????????? ???? ?? ???????????? ?????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>???????????? ????.</translation>
@@ -2395,16 +2477,6 @@
<translation>????? ?? ????????????? ?????????.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>????????????? ???????????.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1 (????????????? ???????????)</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>???????? ???? ????????????. ???????? ??????? ?????????.</translation>
@@ -2454,6 +2526,16 @@
??? ????????? ???????? ???????? ???????? ??????? %1 ? ?????? ? ????????? ??????? ?? ???????? ????? ??????? ??? ?????????????.
??? ?????????: ???????? ???? ???????? ? ????, ?? ?????? ?????? ????????????? ??? ????? ??????????? ? ?????? ????????. ?????????, ??????? %1 ??????? ????????? ?? ????????????????? ????? .sync_*.db, ???????? ??.</translation>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>????????????? ???????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1 (????????????? ???????????)</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2497,16 +2579,6 @@
<translation>??????? ??? ??? ???????????? ?????? ????????? ? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>????????? ?????? ????????? ? ???????...</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>?????? ??????'????? ?????????. ???????? ??? ????????? ??????????.</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>????????? ??????????? ?????? ?????????.</translation>
@@ -2548,16 +2620,31 @@
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>?????????? %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>???? %1 ?? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>?????? ??????'????? ?????????. ???????? ??? ????????? ??????????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>?????????? %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>????????? ?????? ????????? ? ???????...</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2604,21 +2691,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 ? %2, ???? %3 ? %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>???? %1 ?? %2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>?????????? %n ????? ???????</numerusform><numerusform>?????????? %n ???? ????????</numerusform><numerusform>?????????? %n ????? ?????????</numerusform><numerusform>?????????? %n ????? ?????????</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>??????? ?????????????</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>?????????? %n ????? ???????</numerusform><numerusform>?????????? %n ???? ????????</numerusform><numerusform>?????????? %n ????? ?????????</numerusform><numerusform>?????????? %n ????? ?????????</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2778,11 +2860,6 @@
<translation>????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&????????? ??? ?????? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>???????? ?????????? ????????</translation>
@@ -2793,11 +2870,6 @@
<translation>??? ?????????? ????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>??????????????? &?????-???? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>?????????? ?????????? ????</translation>
@@ -2813,17 +2885,32 @@
<translation>?????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>?????? ????????????? ????? ?????????????? ????????, ?????? ????? ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>?????????????? ????? ?????????????? ??????????? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&????????? ??? ?????? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>??????????????? &?????-???? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>?????? ????????????? ????? ?????????????? ????????, ?????? ????? ?????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>?????????, ???? ????????, ?? ???????????????, ???????????? ? ??????? ????? ??????????? ??????????</translation>
@@ -2834,11 +2921,6 @@
<translation>??????????? ???????? ????????????? ?????????, ?????? ???? ????????? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>?????????????? ????? ?????????????? ??????????? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>?????????? ???????? ????? ?? ??????</translation>
@@ -2890,11 +2972,6 @@
<translation>??????? ?????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>&??????????????? ?? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>&??????????? ?????????? ?????????</translation>
@@ -2915,6 +2992,16 @@
<translation>??????? ????????????</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation>????????? &??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>&??????????????? ?? ???????</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>?????????? ???????, ?? ??? ????? ???????? ?????.</translation>
@@ -2935,6 +3022,11 @@
<translation>????????? ???????? ?????????, ???????? ????????? ???????????? ?????? ?? ????? ???????.</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation>????????? ?? &%1</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>??????????</translation>
@@ -3014,6 +3106,11 @@
<source>Debug archive is created at %1</source>
<translation>????? ??????????? ???????? ? %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation>???????? ??????????, ??? ?????????? ??????????????, ???? ??? ?????? ?? ? ???????? ??????! ????? ??????????? ???????? ? %1</translation>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3178,102 +3275,97 @@
<translation>???? ??'? ?????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>????????????? ????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>????????? ?????????????? ???? %1, ???????? ???? ??'? ??????? ??????????? ??????????? ???????? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>???? ??????? ?? ????????? ?? ????? ???????: * " | & ? , ; : \ / ~ < > ??????? ?? ??????? ?? ??????????</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation>?? ??????? ?? ????????? ? ???????: \ / : ? * " < > | ?????? ?? ??????? ?? ?????????? </translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>????????? ?????????????? ???? "%1", ???????? ??'? ????? ??????? ???????, ?? ?? ? ??????????? ???????? ?????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>???? ??????? ?? ?????????: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>???? ????? ?? ?????????: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>???? ????? ?????? ?? ?????????: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>???? ?????????? ?????? ?? ?????????: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>????????? ???????? ??? ??????????????...</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>? ??? ???????? ???????????? ?? ?????????????? ????? ?????. ????????? ???????? ????? ????????????? ????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>??????? ??? ??? ????????? ???????? %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>??'? ????? ??????? ??????? ?? ??????? ?? ?????????? ????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>??'? ????? ??????? ??????? ?? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>??'? ????? ??????? ??????? ??????????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>??????????? ???????? ??'?</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>??'? ????? ??????? ??????????? ???????: %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>????????? ????????????? ????. ???? ?????, ??????????????, ?? ????? ??'???? ?? ????????.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>????????? ????????????? ????, ???????? ???? ? ????? ?? ??'?? ??? ??????? ?? ???????. ???? ?????, ???????? ???? ??'?.</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>????????? ????????????? ???? ?? ????????. %1</translation>
</message>
@@ -3397,16 +3489,6 @@
<translation><p>???????? ???? ?????? ??????? %1.</p><p><b>%2</b> ???????? ??? ???????????. ??????????? ??????: %3.</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>?????????? ????? ????</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>???????? ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>????????? ?? ???????</translation>
@@ -3431,6 +3513,16 @@
<source>Update manually</source>
<translation>??????? ??????</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>?????????? ????? ????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>???????? ?????????</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3455,6 +3547,23 @@
<translation>??????-?????? ??????? ??????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>????????? ???????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>???????? ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>?????/???</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>?????! ???????????? ?????? ?? ???????????? ?? ???????? ?????? ?? localhost.</translation>
@@ -3477,46 +3586,29 @@
<translation>??????????????? ????????? ????????????.</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>????????? ???????????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>??? ????????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>?????/???</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>???????? ??</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>???????? ?? 3/4 ???????? ?????? ??????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>????????? ????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>??????????? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>????????? ????????????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>??'? ????? ??????-???????</translation>
@@ -3545,6 +3637,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>?? ??????? ?????????? ????????? ????????. </translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>????????? ??????? ?????????...</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>???? ????????? %1 ??????</translation>
@@ -3575,11 +3677,6 @@
<translation>????????? ???????? ?????????. ???? ?????, ????????? %1, ???? ???????? ????????? ??????.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>?? ??????? ?????????? ????????? ????????. </translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>???????? ????? %1. ???? ?????, ????????? <a href='%2'>%2</a> ??? ????????? ?????????.</translation>
@@ -3590,16 +3687,21 @@
<translation>???????? ????? %1. ???? ?????, ????????? %2 ??? ????????? ?????????.</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>????????? ??????? ?????????...</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>?????? ????????? ?????????: ?? ??????? ?????????? ????????? ????????.</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation>?? ?????????????? ????? ????????? %1. ??? ????????? ???????? ?? ????????? ??????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation>???????? ?????????. ??? ????????? ???????? ?? ????????? ??????.</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>???????? ?????????. ? ??? ??????????? ??????? ??????</translation>
@@ -3775,11 +3877,6 @@
<translation><font color="green">??????? ?????????? ?? %1: %2 ?????? %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>???????? URL</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>?? ??????? ?'???????? ? %1 ? %2:<br/>%3</translation>
@@ -3790,6 +3887,16 @@
<translation>?????????? ??? ?????????? ?'??????? ?? %1 ?? %2.</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>?????? ??????????? ????????. ??? ???????, ?? ? ??? ? ????? ???????, <a href="%1">???????? ???</a> ??? ????? ????? ??? ???????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>???????? URL</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>?'??????? ? %1 ????? %2...</translation>
@@ -3800,11 +3907,6 @@
<translation>????????????? ????? ?? ??????? ?????????????? ?? "%1". ??? URL ????????????, ??? ??????? ? ???????????? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>?????? ??????????? ????????. ??? ???????, ?? ? ??? ? ????? ???????, <a href="%1">???????? ???</a> ??? ????? ????? ??? ???????.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>???????? ??????????? ????????? ?? ????? ??????????? WebDAV.</translation>
@@ -4016,62 +4118,34 @@
<translation>????? ??????, ?? ???????????? ?? ??????, ?? ????????????? ???????? ????????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>???????</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>????</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation>??'? ???????? ??????? ?????? "%1", ???? ?? ????????????? ???????? ????????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>??'? %1, ?? ??????? ?????? "%2" ?? ????????????? ???????? ????????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation>????? ??????, ??? ??????? ?????? "%1", ?? ????????????? ???????? ????????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>??'? %1 ??????? ????????? ???? ????????? ??????</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation>??'? ???????? ??????? ?????????? ???? ????????? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>??'? %1 ? ?????????????? ?????? ? ???????? ???????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>??'? ????? ??????? ?????????? ???? ???????????? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation>??'? ???????? ? ?????????????? ??'?? ??? ???? ???????? ???????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation>??'? ????? ? ?????????????? ??'?? ??? ???? ???????? ???????.</translation>
</message>
@@ -4081,6 +4155,24 @@
<translation>??'? ????? ??????? ??????? ?????????? ?????.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>???????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>??'? %1, ?? ??????? ?????? "%2" ?? ????????????? ???????? ????????.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4089,6 +4181,16 @@
<translation>????????? ????????????? ?? ???????????.</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>??'? %1 ??????? ????????? ???? ????????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>??'? %1 ? ?????????????? ?????? ? ???????? ???????.</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>??'? ????? ??????? ??????? ?? ??????? ?????.</translation>
@@ -4179,64 +4281,74 @@
<translation>C????? ????????, ?? ????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>????????? ???????? ????????????? ????? ???????????? ??? ???????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation>???????????? %1 ????????? %2 ?????????? ??? ??? ?????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation>???????????? %1 ????????? %2 ?????????? ??? ??? ????? ??? ???????? %3.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>?? ??????? ??????????? ????, ???????? ???? ???????? ? "%1".</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>??????? ??? ??? ????????? ?????? ????? %1 ? ???? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>?????????? ?? ?????????? ???????????, ???? ??????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>?? ??????? ??????? ???????????? ??'???, ???????? ???????? ?????????? ?????????.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>?????????????, ???????? ??, ?? ??????? ??? ?????????????, ????????? ? ??????? ??????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>?? ?????????, ???????? ?? ?? ????? ??????????? ???????? ??????????? ?? ????? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>?? ?????????, ???????? ?? ?? ????? ??????????? ???????? ????? ?? ????? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>?? ????????? ??????????? ??? ????, ???????? ??? ??? ?????? ? ????? ???? ??? ???????, ???? ???? ??????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>?? ????????? ????????, ???? ??????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>??????? ??? ??? ?????????? ???? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>????????? ??????? ? ???????? ??? ??? ?????????? ???????? "%1": %2</translation>
</message>
@@ -4244,38 +4356,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>????????? ???????? ???? %1 ? ????????? ??</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>??????? ??? ???????????? ????????? ????? ??????????? ????? ????</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>????????? ??????? ??????? %1 ?????? ??? ???????: %2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>????????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>??????? ??? ??? ????????? ?????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>???? ????? ????????????????</translation>
</message>
@@ -4293,12 +4405,6 @@
<translation>????????? ?????????? ???? %1, ???????? ???????? ?????????? ??????????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>???? ???? ??????? ??? ????? ??????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4355,6 +4461,12 @@
<source>The file %1 is currently in use</source>
<translation>???? %1 ????? ????????????????</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>???? ???? ??????? ??? ????? ??????</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4372,39 +4484,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>????????? ???????? ???? %1, ???????: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>????????? ???????? ???? %1, ???????? ?? ???????? ????????? ???? ??? ??????? ? ????? ???? ??'??!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>????????? ???????? ??????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>????????? ??????? ??????? %1 ?????? ??? ???????: %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>????????? ???????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>??????? ??? ??? ????????? ?????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>???? %1 ????? ????????????????</translation>
</message>
@@ -4417,14 +4529,14 @@
<translation>????????? ???????? %1 ????? ???????? ????? ????? ?? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation>????????? ??????? ??? ??? ????????? ??'???? ?? ????????, ???? ?????? ???? ???????? ????????? ?? ???????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>????????? ???????? ????? ????? %1 ? ????????? ??</translation>
</message>
@@ -4432,49 +4544,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>????????? ????????????? ??????? %1, ???????? ???? ??? ??????? ? ????? ?? ??'?? ??? ????????? ?? ????????!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>???? %1 ??????????, ????? ?? ???????? ?? ????????? ? ??????, ???? ??? ????????? ?? ????????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>????????? ???????? ???? %1 ? ????????? ??</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>??????? ? ???????????? ????? PIN</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>??????? ??? ??? ????????? ?????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>???? %1 ????? ????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>?? ??????? ?????????? ?????????????? ???????? ? ????????? ?????????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>??????? ??? ?????????????? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>????????? ???????? ????? ????? %1 ? ????????? ??</translation>
</message>
@@ -4531,39 +4643,39 @@
<translation>????????? ????????????? %1 ? %2, ???????: %3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>??????? ??? ??? ????????? ?????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>???? %1 ????? ????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>?????? ???????? ???????????? HTTP ?????. ?????????? 201, ??? ???????? "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>????????? ???????? ???? %1 ? ????????? ??</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>????????? ???????? ????? ????? %1 ? ????????? ??</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>??????? ? ???????????? ????? PIN</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>??????? ?? ??????? ????????? ?? ???? ?????</translation>
</message>
@@ -4571,22 +4683,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>?? ??????? ??????????? ???????????? ????.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>???? %1 ????????? ???????????, ???????? ????? ????? ???? ? ????? ?? ??'??, ??? ? ?????? ????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>???????????? %1 ????????? ????? ??? ????? ????????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4594,11 +4695,6 @@
<translation>???? %1 ??? ???????????? ??? ?????. ?? ???????????? ???? ?? ??????.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>???? ???????? (??????? ????????????) %1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>???? ?? ???????? ???? ??????? ??? ??? ?????????????. ???? ???? ??????????.</translation>
@@ -4628,6 +4724,22 @@
<source>The file %1 is currently in use</source>
<translation>???? %1 ????? ????????????????</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>???????????? %1 ????????? ????? ??? ????? ????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>?? ??????? ??????????? ???????????? ????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>???? ???????? (??????? ????????????) %1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4876,6 +4988,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>?????????? ???? ????????? ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>? ?????(-??) ??? ?????? ?? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>????????? ???????? ????????? ??????????? ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>????????? ???????? ?????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>?? ??????? ??????????? ??????? "%1"</translation>
@@ -4910,43 +5048,17 @@
<translation>??????? "%1" ??????? ???????????.</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>?????????? ???? ????????? ???????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>???????? ???? ????????????...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>? ?????(-??) ??? ?????? ?? ??????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>??????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>???</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>????????? ???????? ?????????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>????????? ???????? ????????? ??????????? ??????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>????? ?? ????????? ???????</translation>
@@ -4962,11 +5074,6 @@
<translation>??????? ????? ???????? ? ???????? ?????? ????? ?? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>????????? ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>???????????</translation>
@@ -4993,12 +5100,6 @@
<translation><numerusform>??????? ?? %1 ???????</numerusform><numerusform>??????? ?? %1 ???????</numerusform><numerusform>??????? ?? %1 ??????</numerusform><numerusform>??????? ?? %1 ??????</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>???????? ? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>????'????? ???????? ...</translation>
@@ -5028,6 +5129,17 @@
<source>Delete</source>
<translation>????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>????????? ?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>???????? ? ????????</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5129,13 +5241,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>?'??????? ?? ???????????.
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>?????? ???????: %1</translation>
@@ -5155,6 +5260,13 @@
<source>The connection is not secure</source>
<translation>?'??????? ?? ? ?????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>?'??????? ?? ???????????.
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5247,6 +5359,32 @@
<translation>%1 (????????? ????? ????????? ???????, ???????? ?????? ????? %2)</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>???????? ???? %1, ??? ??????? ????????? ???? ? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>????????? ???????? ??? ???????? ???????? ?????????????? ???? ?????. ?????????, ?? ?? ????? ?????? ?? ????? ? ???????? ?????????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>???????????? ????? ?? ?????. ???????????, ??? ?????? ???????? ?????? ????? ?? 1% ???? ?????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>??????????? ????? ?? ??????? ??? ??????? ???????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>????????, ???? ????????? ????'?????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>????????? ??????? ????: %1</translation>
@@ -5267,22 +5405,6 @@
<translation>????????? ?????????? ????? ????? ?? ????????? ??: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>????????, ???? ????????? ????'?????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>???????? ???? %1, ??? ??????? ????????? ???? ? %2</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>????????? ???????? ??? ???????? ???????? ?????????????? ???? ?????. ?????????, ?? ?? ????? ?????? ?? ????? ? ???????? ?????????????.</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>???????????? ??????????? ?????? ? ????????, ??? ?????? ?? ???????????</translation>
@@ -5302,16 +5424,6 @@
<source>Cannot open the sync journal</source>
<translation>?? ???????? ???????? ???????? ?????????????</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>???????????? ????? ?? ?????. ???????????, ??? ?????? ???????? ?????? ????? ?? 1% ???? ?????????.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>??????????? ????? ?? ??????? ??? ??????? ???????????.</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5322,7 +5434,7 @@
<translation>?????? ?? ????????</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>?? ????? ???????? ????? ????????????</translation>
</message>
@@ -5706,11 +5818,6 @@
<source>Less than a minute</source>
<translation>???? ??? ?? ???????</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation><numerusform>%n ???????</numerusform><numerusform>%n ???????</numerusform><numerusform>%n ??????</numerusform><numerusform>%n ??????</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5718,20 +5825,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation><numerusform>%n ?????</numerusform><numerusform>%n ??????</numerusform><numerusform>%n ?????</numerusform><numerusform>%n ?????</numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1 ???????</numerusform><numerusform>%1 ???????</numerusform><numerusform>%1 ??????</numerusform><numerusform>%1 ??????</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation><numerusform>%n ????</numerusform><numerusform>%n ???</numerusform><numerusform>%n ????</numerusform><numerusform>%n ????</numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1 ??????</numerusform><numerusform>%1 ??????</numerusform><numerusform>%1 ?????</numerusform><numerusform>%1 ?????</numerusform></translation>
@@ -5746,6 +5843,21 @@
<source>%1 days</source>
<translation><numerusform>%1 ????</numerusform><numerusform>%1 ???</numerusform><numerusform>%1 ????</numerusform><numerusform>%1 ????</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation><numerusform>%n ???????</numerusform><numerusform>%n ???????</numerusform><numerusform>%n ??????</numerusform><numerusform>%n ??????</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n ?????</numerusform><numerusform>%n ??????</numerusform><numerusform>%n ?????</numerusform><numerusform>%n ?????</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n ????</numerusform><numerusform>%n ???</numerusform><numerusform>%n ????</numerusform><numerusform>%n ????</numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5888,6 +6000,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>???????? ???? ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>???????? ??????????? ???????? ?????????????.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>???'?????? ??? %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>?? ?????? ??????? ?? ?????????????</translation>
@@ -5908,31 +6035,6 @@
<translation>?????????? %1 ??? ???????? ????? ???????????? ?????? ?????? ???????. ??? ???? ?????????????? ?? %2, ?? ?? ??????? ??????????? ?? ?????????? ? ???????.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>???'?????? ??? %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>???'?????? ??? ????????? ???????:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>????????? ????? %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>???????? ???? ?????</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>????????????? ?????????? ?????? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5954,11 +6056,6 @@
<translation>macOS VFS ??? %1: ??????? ??? ??? ?????????????.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>???????? ??????????? ???????? ?????????????.</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>????????? ?? ????? ????????? "%1"</translation>
@@ -5969,6 +6066,21 @@
<translation>????????? ?? ????? ?? ???????? "%1"</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>???'?????? ??? ????????? ???????:</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>????????? ????? %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>????????????? ?????????? ?????? ????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
@@ -5977,11 +6089,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>?? ??????? ?? ????????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>??'? ???????????</translation>
@@ -6017,22 +6124,11 @@
<translation>?????? ????? ?????????????? ?????????, ???????? ?????? ??</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>?????? ????? ?????????????? ???????? ??????</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>???????, ?? ?????? ??????????????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>???????? ???? ?? ????????</translation>
@@ -6047,6 +6143,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>???????? ??????? ?? ???????? ?? ?????? ????????????? ? ????</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>???????, ?? ?????? ??????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>?? ??????? ?? ????????</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6087,6 +6199,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>? ???????????</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1m</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>?????</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>?????? ??? ????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1: %2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6127,57 +6284,12 @@
<source>Synced %1</source>
<translation>?????????????? %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>? ???????????</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>?????</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1m</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>?????? ??? ????</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation>??????? ??? ??? ????????? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1: %2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>????, ?? ??????????? ?? ??????? '#', ?? ????????????? ??????????? ?????????????? ??????.</translation>
@@ -6423,6 +6535,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>???????? ???????? ??? ??????? ????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>???????? ??????? ?? ????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>?'??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>???'??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>???????? ????????? ??????? "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>???????? ???????? ??????? "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>???????? %1 ? ????????? ??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>???? ???? ???????????? ?? ????????? ?????????</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6612,16 +6767,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 ?</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 ??</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 ??</translation>
@@ -6636,6 +6781,16 @@
<source>%L1 KB</source>
<translation>%L1 ?? </translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 ?</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 ??</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6869,16 +7024,16 @@
<translation>??????? ??? ??? ????????????</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>?????????? ?? ?????????????</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>??????? ?????????????</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>?????????? ?? ?????????????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>????????????? ???????????</translation>
@@ -6937,4 +7092,17 @@
<translation>????????? ????? ?? ????????</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>????????? ?????? ?????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>?????? ????????????? ????????? ???????????????? ?????? ????? ? ?????? ?? ????????????, ?? ????????? ? ?????????, ??? ???? ????????. ?? ??????? ?????? ?? ??? ??????? ??? ??? ??????????? ???????????? ??????????? ??????. ?????, ?? ????? ???????? ?? ?????? ?????????? ??????, ??? ???? ?????????? ?? ?????????, ??? ?? ???????????? ??????.</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_zh_CN.ts nextcloud-desktop-3.16.6/translations/client_zh_CN.ts
--- nextcloud-desktop-3.16.4/translations/client_zh_CN.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_zh_CN.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>??????</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>???????????????????????????????????????????????????????????????????????????????</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>??????</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation>???????????</translation>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -558,7 +550,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>?????</translation>
</message>
@@ -573,7 +565,7 @@
<translation>??</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>????????????????</translation>
</message>
@@ -581,33 +573,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>?????...</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>??????????????????<b>??</b>????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>??</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>??</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>? <server> ??? <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>????</translation>
@@ -638,6 +608,33 @@
<translation>????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>?????...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>? <server> ??? <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>???????</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>??????????</translation>
@@ -673,9 +670,9 @@
???????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>???????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation>??????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -688,6 +685,11 @@
<translation>?????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation>?????????<b>??</b>??????????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>???????????</translation>
@@ -713,6 +715,13 @@
<translation>???????????????????????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation>??????????????????????????
+???????</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -737,12 +746,6 @@
<translation>?????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>?????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>??</translation>
@@ -781,16 +784,6 @@
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>?????????</translation>
@@ -816,21 +809,11 @@
<translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>????????? <i>%1</i>?</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>???????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>?????????<i>%1</i>???</p><p><b>???</b> ? <b>??</b> ???????</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>?????????</translation>
@@ -860,24 +843,24 @@
<translation>????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>?????????????? 12 ??????????????????????????????????????????????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation>??????????????? 12 ??????????????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>???????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation>????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>?? %1 ???????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation>????????? %1 ?????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>???????????????????????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation>????????????????????????????<br>?????????????????????????????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -890,34 +873,44 @@
<translation>??????<br/>?????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1 ?%3%? of %2 ??????????????????????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>??? %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>??? %1 / %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>?????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>??????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>??????????? %1MB: %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>??? %1</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation>????????????????????<br>?????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 ?? %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>????????????????????????<br>?????????????????????<br>????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>????? %1 ???????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation>????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>??????????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -935,79 +928,125 @@
<translation>??? %1?????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>??? %1 ????????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>? %1 ???</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>????? %1 ??</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>??????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>????? %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>?????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>????????%1 ? %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>?????? %1 ?????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>?????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>?? %1 ?????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>?????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>??????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>????????? <i>%1</i>?</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>?????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>?????????<i>%1</i>???</p><p><b>???</b> ? <b>??</b> ???????</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>????????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>?????????????? 12 ??????????????????????????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>??????????? %1MB: %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>????????????????????????<br>?????????????????????<br>????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>?? %1 ???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>??????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>???????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1 ?%3%? of %2 ??????????????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>??? %1 / %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>??????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 ?? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>????? %1 ???????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>??? %1 ????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>????? %1 ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>????? %1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>????????%1 ? %2.</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>?????? %1 ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>?? %1 ?????</translation>
</message>
</context>
<context>
@@ -1122,11 +1161,6 @@
<translation>????? (pkcs12):</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>??...</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>?????</translation>
@@ -1137,6 +1171,11 @@
<translation>?????????pkcs12 ?????????????????</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>??...</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>????</translation>
@@ -1187,34 +1226,34 @@
<translation>??</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 ???</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 ???</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 ????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 ????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1222,12 +1261,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>???????????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>?? %1 ????????????????????????????</translation>
</message>
@@ -1269,6 +1308,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation>??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation>??????????????? %1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation>?????? %1???????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation>???????????? %1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation>?????? %1??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation>?????????%1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation>?? %1 ???????</translation>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1276,6 +1354,11 @@
<translation>?????? %1?????????????????????</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation>?????????????????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>?? %1 ????????????????</translation>
@@ -1480,7 +1563,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>???????????</translation>
</message>
@@ -1610,21 +1693,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>?????????<i>?1</i>???????</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>?????????<i>?1</i>?</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>????</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1640,30 +1708,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>?????? Nextcloud ??</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>?????????<i>?1</i>???????</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>?????????????</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>?????????<i>?1</i>?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>????</translation>
</message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
<message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>??</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>????????</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>???????????????</translation>
@@ -1673,16 +1741,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>????????????????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>?????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>?????? Nextcloud ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>????????</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>???????????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>???? %1 ?????</translation>
</message>
@@ -1690,19 +1773,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>??????PROPFIND ??????? XML?</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>???????????????????????</translation>
</message>
@@ -1710,27 +1793,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>???? %1 ???</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>??????%1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>???????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>???? %1 ???</translation>
</message>
@@ -1928,13 +2011,13 @@
<location filename="../src/gui/filedetails/filedetails.cpp" line="125"/>
<source>%1 second(s) ago</source>
<comment>seconds elapsed since file last modified</comment>
- <translation><numerusform>%1??</numerusform></translation>
+ <translation><numerusform>%1 ??</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/filedetails/filedetails.cpp" line="128"/>
<source>%1 minute(s) ago</source>
<comment>minutes elapsed since file last modified</comment>
- <translation><numerusform>%1???</numerusform></translation>
+ <translation><numerusform>%1 ???</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/filedetails/filedetails.cpp" line="131"/>
@@ -1970,11 +2053,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>???? URL ? HTTPS ?????? URL ???????????????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>?????? URL ?? HTTPS ??????? URL ? HTTPS ???????????????????????????????</translation>
@@ -1986,28 +2064,33 @@
<translation>????????<em>%i</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>???? URL ? HTTPS ?????? URL ???????????????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>???????????<br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>???????????JSON???<br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation>??????????????????<br><em>%1</em></translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>???????????JSON???<br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2050,6 +2133,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 ???? %2?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 ???? %2?</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation><numerusform>%1 ? %n ??????????</numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>??????????? %1 ????</translation>
@@ -2065,17 +2176,6 @@
<translation>????????%1 ????????</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 ? %n ?????????</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ????</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>??? %1 ??? %n ???</numerusform></translation>
@@ -2089,39 +2189,22 @@
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been updated.</source>
- <translation><numerusform>%1 ? %n ????????</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ????</translation>
+ <translation><numerusform>%1 ? %n ?????????</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
- <translation><numerusform>%1 ????? %2?%n ?????????</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 ???? %2?</translation>
+ <translation><numerusform>%1 ????? %2?%n ??????????</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
- <translation><numerusform>%1 ???? %2?%n ?????????</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 ???? %2?</translation>
+ <translation><numerusform>%1 ???? %2?%n ??????????</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
- <translation><numerusform>%1 ? %n ??????????</numerusform></translation>
+ <translation><numerusform>%1 ? %n ???????????</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="487"/>
@@ -2131,7 +2214,7 @@
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
- <translation><numerusform>%1 ? %n ???????????????????????</numerusform></translation>
+ <translation><numerusform>%1 ? %n ??????????????????????</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="494"/>
@@ -2141,7 +2224,7 @@
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) are currently locked.</source>
- <translation><numerusform>%1 ? %n ????????????</numerusform></translation>
+ <translation><numerusform>%1 ? %n ?????????????</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="501"/>
@@ -2154,68 +2237,68 @@
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>???????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>???? %1 MB ????? %2 ?????
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>?????????????????
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>?????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>???????????????? %1MB?%2?
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>??? %1 ????????????? %2MB</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>?????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>??? %1 ?????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>?? %1 ??????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2228,12 +2311,12 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>????????????? ?%1???? ?%2?????? ?%3??</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2242,7 +2325,7 @@
????????? ?%1? ?????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2251,22 +2334,22 @@
?????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>????????</translation>
</message>
@@ -2307,11 +2390,6 @@
<translation>?????????</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>?????????%1?????????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>????</translation>
@@ -2322,6 +2400,11 @@
<translation>??? %1?</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>?????????%1?????????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>?????</translation>
@@ -2392,16 +2475,6 @@
<translation>????????</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>??????</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1???????</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>????????????????</translation>
@@ -2451,6 +2524,16 @@
?????????????????? %1 ?????????????
???????????????????????????????????%1 %1 ?????????? .sync_*.db ??????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1???????</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2494,16 +2577,6 @@
<translation>?????????????</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>???????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>?????????</translation>
@@ -2545,16 +2618,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>?? %1/s</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>?? %1/%2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>?</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>?? %1/s</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>???????????????</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2601,21 +2689,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%2 ? %1?%4 ??? %3</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>?? %1/%2</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>???? ?n ????????</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>??????</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>???? ?n ????????</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2775,11 +2858,6 @@
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>????????(&L)</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>??????</translation>
@@ -2790,11 +2868,6 @@
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>??????(&M)</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>??????</translation>
@@ -2810,17 +2883,32 @@
<translation>??</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>?????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>???????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>????????(&L)</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>??????(&M)</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>?????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>????????????????????</translation>
@@ -2831,11 +2919,6 @@
<translation>??????????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>???????????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>????????????</translation>
@@ -2884,17 +2967,12 @@
<message>
<location filename="../src/gui/generalsettings.ui" line="359"/>
<source>Update channel</source>
- <translation>????</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>?????(&R)</translation>
+ <translation>????</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
- <translation>???????&A?</translation>
+ <translation>??????(&A)</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="428"/>
@@ -2912,6 +2990,16 @@
<translation>????</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation>????(&D)</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>?????(&R)</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>???????????</translation>
@@ -2932,24 +3020,29 @@
<translation>?????????????????????????</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation>??? &%1</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
- <translation>???</translation>
+ <translation>stable</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.cpp" line="417"/>
<source>beta</source>
- <translation>???</translation>
+ <translation>beta</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.cpp" line="421"/>
<source>daily</source>
- <translation>??</translation>
+ <translation>daily</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.cpp" line="425"/>
<source>enterprise</source>
- <translation>??</translation>
+ <translation>enterprise</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.cpp" line="453"/>
@@ -2976,7 +3069,7 @@
<message>
<location filename="../src/gui/generalsettings.cpp" line="465"/>
<source>Changing update channel?</source>
- <translation>???????</translation>
+ <translation>???????</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.cpp" line="466"/>
@@ -2984,14 +3077,14 @@
- stable: contains tested versions considered reliable
</source>
<comment>starts list of available update channels, stable is always available</comment>
- <translation>????????????????
+ <translation>????????????????
- stable?????????????
</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.cpp" line="472"/>
<source>Change update channel</source>
- <translation>??????</translation>
+ <translation>??????</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.cpp" line="473"/>
@@ -3013,6 +3106,11 @@
<source>Debug archive is created at %1</source>
<translation>???????? %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation>?????????????????? %1</translation>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3177,102 +3275,97 @@
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>?????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>???????%1????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>??????????* " | & ? , ; : \ / ~ < > ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation>????????????\ / : ? * " < > | ??/????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>?????? "%1" ??????????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>??????????%1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>????????????%1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>??????????? %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>????????????? %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>?????????...</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>?????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>????????? %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>???????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>??????????%1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>??????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>?????????? %1</translation>
</message>
@@ -3394,16 +3487,6 @@
<translation><p>???? %1 ??????</p><p><b>%2</b> ?????????????? %3?</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>????</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>????</translation>
@@ -3428,6 +3511,16 @@
<source>Update manually</source>
<translation>????</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>????</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3452,6 +3545,23 @@
<translation>?????????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>??????????????????</translation>
@@ -3474,46 +3584,29 @@
<translation>??????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>???</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>???</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>???? 3/4 ???</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>????</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>????????</translation>
@@ -3542,6 +3635,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>???????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>?? %1 ?????</translation>
@@ -3572,11 +3675,6 @@
<translation>?????????? %1 ???????</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>????????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>??? %1 ?????? <a href='%2'>%2</a>????</translation>
@@ -3587,16 +3685,21 @@
<translation>?? %1 ???????? %2 ?????</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>???????????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>?????????</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation>????? %1 ???????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation>?????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>???????????????????</translation>
@@ -3772,11 +3875,6 @@
<translation><font color="green">????? %1?%2 ?? %3?%4?</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>??URL</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>??? %1 ?%2????<br />%3</translation>
@@ -3787,6 +3885,16 @@
<translation>??? %1 ?%2? ????</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>?????????<a href="%1">?????????</a> ???????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>??URL</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>????? ?1 ? ?2 ??</translation>
@@ -3797,11 +3905,6 @@
<translation>???????????????????%1??URL ???????????</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>?????????<a href="%1">?????????</a> ???????????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>????? WebDAV ???????</translation>
@@ -4007,62 +4110,34 @@
<translation>??????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>???</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>??</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation>?????????????%1????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>%1 ???????????? "%2" ????</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation>?????????????%1???????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>%1 ????????????</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation>???????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>%1 ???????????????</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>?????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation>??????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation>?????????????????</translation>
</message>
@@ -4072,6 +4147,24 @@
<translation>?????????</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>???</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>%1 ???????????? "%2" ????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4080,6 +4173,16 @@
<translation>?????????</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>%1 ????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>%1 ???????????????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>???????????</translation>
@@ -4170,64 +4273,74 @@
<translation>?????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>???????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation>%1 ???????????????? %2?</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation>%1 ????????? %3 ?????? %2?</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>?????????????? ?%1? ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>?????????? %1 ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>??????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>?????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>?????????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>??????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>???????? "%1" ????????: %2 </translation>
</message>
@@ -4235,38 +4348,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>?????????????%1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>?????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>??? %1 ?????????%2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>????????%1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>??????</translation>
</message>
@@ -4284,12 +4397,6 @@
<translation>?? %1 ???????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>????????????????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4346,6 +4453,12 @@
<source>The file %1 is currently in use</source>
<translation>?? %1 ????</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>????????????????</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4363,39 +4476,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>?????? %1????%2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>??????? %1?????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>??????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>??? %1 ?????????%2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>????????%1 </translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>?? %1 ???? </translation>
</message>
@@ -4408,14 +4521,14 @@
<translation>?????????????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation>???????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>?????????????? %1</translation>
</message>
@@ -4423,49 +4536,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>??? %1 ??????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>????? %1???????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>?????????????%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>????????%1 </translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>?? %1 ???? </translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>???????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>???????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>?????????????? %1</translation>
</message>
@@ -4522,39 +4635,39 @@
<translation>??? %1 ???? %2????%3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>????????%1 </translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>?? %1 ???? </translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>?????? HTTP ???????? 201???????%1 %2??</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>????????????%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>?????????????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>???????????</translation>
</message>
@@ -4562,22 +4675,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>????????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>?? %1 ?????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>?? %1 ????????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4585,11 +4687,6 @@
<translation>?? %1 ????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>???????????%1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>????????????????????</translation>
@@ -4619,6 +4716,22 @@
<source>The file %1 is currently in use</source>
<translation>?? %1 ???? </translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>?? %1 ????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>???????????%1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4867,6 +4980,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>??????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>??????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>???? ?%1? ??????</translation>
@@ -4901,43 +5040,17 @@
<translation>???????????%1?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>???????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>?????? ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>??????????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>??</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>??????????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>??????????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>?????</translation>
@@ -4953,11 +5066,6 @@
<translation>????????????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>??????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>??</translation>
@@ -4984,12 +5092,6 @@
<translation><numerusform>%1 ?????</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>???????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>???? ...</translation>
@@ -5019,6 +5121,17 @@
<source>Delete</source>
<translation>??</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>???????</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5120,13 +5233,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>?????????
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>??????%1</translation>
@@ -5146,6 +5252,13 @@
<source>The connection is not secure</source>
<translation>????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>?????????
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5238,6 +5351,32 @@
<translation>%1 (????????????%2????? )</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>?? %1 ??????? %2 ????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>????????????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>?????????????????????? %1 ?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>?????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>???????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>???????%1</translation>
@@ -5258,22 +5397,6 @@
<translation>????????????????%1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>???????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>?? %1 ??????? %2 ????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>????????????????????????????????</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>??????????????????</translation>
@@ -5293,16 +5416,6 @@
<source>Cannot open the sync journal</source>
<translation>????????</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>?????????????????????? %1 ?????????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>?????????????????</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5313,7 +5426,7 @@
<translation>??</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>?????????</translation>
</message>
@@ -5697,11 +5810,6 @@
<source>Less than a minute</source>
<translation>?????</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation><numerusform>%n ??</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5709,20 +5817,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation><numerusform>%n ??</numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1 ??</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation><numerusform>%n ?</numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1 ??</numerusform></translation>
@@ -5737,6 +5835,21 @@
<source>%1 days</source>
<translation><numerusform>%1 ?</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation><numerusform>%n ??</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n ??</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n ?</numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5879,6 +5992,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>??????? %1</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>?????????</translation>
@@ -5899,31 +6027,6 @@
<translation>???? %1 ????????????????????? %2????????????</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>??????? %1</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>??????</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>?? %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>???</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>???????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5945,11 +6048,6 @@
<translation>?1 ? macOS VFS??????</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>????????????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>????? "%1" ????</translation>
@@ -5960,6 +6058,21 @@
<translation>????? "%1" ???</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>?? %1: %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>???????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1?%2, %3?</translation>
@@ -5968,11 +6081,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>?????(&L)</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>???</translation>
@@ -6008,22 +6116,11 @@
<translation>????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>?????????????</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>????????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>??????</translation>
@@ -6038,6 +6135,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>?????????????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>?????(&L)</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6078,6 +6191,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%n??</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>??</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%n???</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1???</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%n???</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1?%2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6118,57 +6276,12 @@
<source>Synced %1</source>
<translation>??? %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%n??</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>??</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%n???</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>??</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1???</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%n???</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>??</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation>?????????</translation>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1?%2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>VFS ??????? '#' ??????</translation>
@@ -6414,6 +6527,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>????????%1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>??????? "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>????????? %1</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>????????????</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6603,16 +6759,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6627,6 +6773,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6860,16 +7016,16 @@
<translation>???????</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>??????</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>??????</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>??????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>?????</translation>
@@ -6928,4 +7084,17 @@
<translation>??????</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>???????????????????????????????????????????????????????????????????????????????</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_zh_HK.ts nextcloud-desktop-3.16.6/translations/client_zh_HK.ts
--- nextcloud-desktop-3.16.4/translations/client_zh_HK.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_zh_HK.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>??????</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>??????????????????????????????????????????????????????????????????????????</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>??????</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation>???????????</translation>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -558,7 +550,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>????</translation>
</message>
@@ -573,7 +565,7 @@
<translation>??</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>????????????????</translation>
</message>
@@ -581,34 +573,12 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>??????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>???????????????<b>??</b>????????????
</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>??</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>??</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>? <user> ????? <server></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>????</translation>
@@ -639,6 +609,33 @@
<translation>????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>? <user> ????? <server></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>???????</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>??????????</translation>
@@ -673,9 +670,9 @@
<b>?????????? ????????</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>???????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation>??????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -688,6 +685,11 @@
<translation>?????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation>?????????<b>??</b>?????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>???????????</translation>
@@ -713,6 +715,14 @@
<translation>????????????????????????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation>?????????????????????????
+???????
+</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -737,12 +747,6 @@
<translation>??????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>?????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>??</translation>
@@ -781,16 +785,6 @@
<translation>??????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>?????????</translation>
@@ -816,21 +810,11 @@
<translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>?????????<i>%1</i>?</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>???????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>??????????? <i>%1</i>?</p><p><b>???</b> ??? <b>??</b> ??????</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>?????????</translation>
@@ -864,24 +848,24 @@
<translation>????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>??????????????12??????????????????????????????????????????????????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation>??????????????? 12 ??????????????????????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>???????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation>????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>?? %1 ???????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation>?????????? %1 ?????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>????????????????????<br>?????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation>???????????????????????????<br>?????????????????????????????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -894,34 +878,44 @@
<translation>?????<br/>????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>%1?%3%??? %2 ????? ????????????????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>%1 ????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>??? %2 ?? %1%</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>??????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>???????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>??????????? %1MB?%2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>%1 ????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation>????????????????????<br>???????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 ? %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>???????????????????<br>??????????????????<br>???????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>?????%1?????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation>??????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>??????????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -939,79 +933,125 @@
<translation>??? %1 ????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>??? %1 ???????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>? %1 ??</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>????? %1...</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>????? %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>???????????????????? </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>????????%1 ? %2?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>????????????????????????? </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>???? %1 ???????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>?????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>?? %1 ?????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>??????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>????????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>?????????<i>%1</i>?</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>???????????????????? </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>??????????? <i>%1</i>?</p><p><b>???</b> ??? <b>??</b> ??????</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>????????????????????????? </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>??????????????12??????????????????????????????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>??????????? %1MB?%2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>???????????????????<br>??????????????????<br>???????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>?? %1 ???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>??????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>????????????????????<br>?????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>%1?%3%??? %2 ????? ????????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>??? %2 ?? %1%</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>???????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 ? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>?????%1?????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>??? %1 ???????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>????? %1...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>????? %1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>????????%1 ? %2?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>???? %1 ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>?? %1 ?????</translation>
</message>
</context>
<context>
@@ -1126,11 +1166,6 @@
<translation>??????pkcs12??</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>?? ?</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>?????</translation>
@@ -1141,6 +1176,11 @@
<translation>????????? pkcs12 ???????????????????</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>?? ?</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>??????</translation>
@@ -1193,34 +1233,34 @@
<translation>??</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 ???</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 ???</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%n ????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 ????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1228,12 +1268,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>?????????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>?? %1 ??????????????????????????</translation>
</message>
@@ -1275,6 +1315,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation>?????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation>??????????????? %1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation>?? %1 ???????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation>???????????? %1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation>?? %1 ?????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation>?????????%1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation>?? %1 ?????</translation>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1282,6 +1361,11 @@
<translation>%1?????????????????????????????</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation>??????????????????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>?? %1 ???????? ?????????</translation>
@@ -1486,7 +1570,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>???????metadata??????</translation>
</message>
@@ -1616,21 +1700,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>?????????? <i>%1</i> ????????</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>?????????? <i>%1</i> ??</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>????</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1646,30 +1715,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>?? Nextcloud ??????</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>?????????? <i>%1</i> ????????</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>???????????????</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>?????????? <i>%1</i> ??</translation>
</message>
<message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>????</translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
+ <message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>??</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>????????</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>?????????????????</translation>
@@ -1679,16 +1748,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>????????????????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>???????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>?? Nextcloud ??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>????????</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>?????????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>?? %1 ??????</translation>
</message>
@@ -1696,19 +1780,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>??????PROPFIND?????XML???</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>????????????????????????</translation>
</message>
@@ -1716,27 +1800,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>???? %1 ????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>??????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>??????%1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>????????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>???? %1 ????</translation>
</message>
@@ -1975,11 +2059,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>???? URL ? HTTPS ?????? URL ?? HTTPS ??? ?????????????? ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>???? URL ? HTTPS ?????????? URL ?? HTTPS ??? ?????????????? ?????????</translation>
@@ -1991,27 +2070,32 @@
<translation>??????????<em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>???? URL ? HTTPS ?????? URL ?? HTTPS ??? ?????????????? ?????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation> ????????????<br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>??????????JSON?<br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>?????????????????</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
- <translation type="unfinished"/>
+ <translation>??????????????????<br><em>%1</em></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>??????????JSON?<br><em>%1</em></translation>
</message>
</context>
<context>
@@ -2055,6 +2139,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>%1 ?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 ??????? %2?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 ????? %2?</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation><numerusform>??? %1 ? %n ??????</numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>??????????? %1 ????</translation>
@@ -2070,17 +2182,6 @@
<translation>????????%1 ??????????</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>%1 ? %n ??????????</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ?????</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>%1 ? %n ??????????</numerusform></translation>
@@ -2096,33 +2197,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 ? %n ??????????</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>%1 ?????</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ????? %2 ?? %n????????</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 ??????? %2?</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 ?????%2 ?? %n ?????????</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 ????? %2?</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2159,67 +2243,67 @@
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>???????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>????%1MB??????????%2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>???????????????? %1MB?%2?
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>???????????????? %2MB?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>???%1?????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>???%1???????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2232,12 +2316,12 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>?????????????%1??????%2????????%3?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2246,7 +2330,7 @@
?????????%1??????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2255,22 +2339,22 @@
?????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>?????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>????????</translation>
</message>
@@ -2311,11 +2395,6 @@
<translation>?????????</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>??????????? "%1"??????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation>????</translation>
@@ -2326,6 +2405,11 @@
<translation>??? %1?</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>??????????? "%1"??????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>??????</translation>
@@ -2396,16 +2480,6 @@
<translation>????????</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>?????</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1??????</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>?????????????????</translation>
@@ -2455,6 +2529,16 @@
?????????????????? %1???????????????
????????????????????????????????????? %1 ??????????? .sync_*.db ????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1??????</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2498,16 +2582,6 @@
<translation>??????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>????????????...</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>??????????????</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>??????????</translation>
@@ -2549,16 +2623,31 @@
<translation>%1 %2 ?</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>?? %1??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>?? %2 ? %1</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>??????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>? </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>?? %1??</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>????????????...</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2605,21 +2694,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%2 ? %1? ?? %4 ? %3</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>?? %2 ? %1</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>???? %n ????</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>??????</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>???? %n ????</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2779,11 +2863,6 @@
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>&???????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>??????</translation>
@@ -2794,11 +2873,6 @@
<translation>??????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>??&????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>??????</translation>
@@ -2814,17 +2888,32 @@
<translation>??</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>?????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>??????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>&???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>??&????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>?????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>????????????????????</translation>
@@ -2835,11 +2924,6 @@
<translation>??????????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>??????????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>????????????</translation>
@@ -2891,11 +2975,6 @@
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>????????&R?</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>???????&A?</translation>
@@ -2916,6 +2995,16 @@
<translation>????</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation>??&???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>????????&R?</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>?????????</translation>
@@ -2936,6 +3025,11 @@
<translation>?????????????????????????</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation>??? &%1</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>???</translation>
@@ -3017,6 +3111,11 @@
<source>Debug archive is created at %1</source>
<translation>?????????? %1</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation>?????????????? %1 ???????</translation>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3181,102 +3280,97 @@
<translation>?????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>??????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>?????? "%1"??????????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>????????????* " | & ? , ; : \ / ~ < > ??/????</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
- <translation type="unfinished"/>
+ <translation>????????????\ / : ? * " < > | ?????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>???????%1????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>????????%1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>????????????%1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>????????????%1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>???????????%1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>???????? ...</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>?????????? ??????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>?????????? %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>?????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>??????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>??????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>??????????%1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>???????? ????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>?????????????????????? ?????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>???????????%1</translation>
</message>
@@ -3400,16 +3494,6 @@
<translation><p>%1 ?????????</p><p><b>%2</b> ????? ???????? %3?</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>??????</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>????</translation>
@@ -3434,6 +3518,16 @@
<source>Update manually</source>
<translation>????</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>????</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3458,6 +3552,23 @@
<translation>?????????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KBytes/s</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>?????????????????</translation>
@@ -3480,46 +3591,29 @@
<translation>??????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KBytes/s</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>???</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>??????? 3/4</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>????</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>?????????</translation>
@@ -3548,6 +3642,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>??????...</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>? %1 ??????</translation>
@@ -3578,11 +3682,6 @@
<translation>??????????? %1 ????????</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>????????????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>??? %1 ????????? <a href='%2'>%2</a> ??????</translation>
@@ -3593,16 +3692,21 @@
<translation>??? %1 ??????? %2 ??????</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>??????...</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>??????? ????????????</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation>????? %1 ???????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation>??????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>??????????????????</translation>
@@ -3778,11 +3882,6 @@
<translation><font color="green">????? %1? %2 ?? %3?%4?</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>? %2 ??? %1 ???<br/>%3</translation>
@@ -3793,6 +3892,16 @@
<translation>? %2 ????? %1 ???</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>?????????????????????? <a href="%1">?????</a> ??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>??? %1 ????? %2</translation>
@@ -3803,11 +3912,6 @@
<translation>??????????????????? ?%1?? URL ??????????????</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>?????????????????????? <a href="%1">?????</a> ??????????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>????? WebDAV ???????</translation>
@@ -4019,64 +4123,36 @@
<translation>???????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>???</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>??</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
- <translation type="unfinished"/>
+ <translation>???????????%1??????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>???????????? "%2" ? %1 ???</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>%1 ??????????</translation>
+ <translation>???????????%1?????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>????????%1 ??????????????</translation>
+ <translation>????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
+ <translation>??????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
- <translation type="unfinished"/>
+ <translation>?????????????????</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="433"/>
@@ -4084,6 +4160,24 @@
<translation>???????????</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>???</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>???????????? "%2" ? %1 ???</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4092,6 +4186,16 @@
<translation>??????????</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>%1 ??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>????????%1 ??????????????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>??????????</translation>
@@ -4182,64 +4286,74 @@
<translation>??????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>?????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation>%1 ???????????????? %2?</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation>%1 ????????? %3 ??????? %2?</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>????????????%1????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>??????????? %1 ???</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>??????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>?????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>??????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>??????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>???????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>?????????%1??????%2</translation>
</message>
@@ -4247,38 +4361,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>????????????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>??????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>?????? %1 ?????%2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>?????????%1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>???????</translation>
</message>
@@ -4296,12 +4410,6 @@
<translation>%1???????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>?????????????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4358,6 +4466,12 @@
<source>The file %1 is currently in use</source>
<translation>?? %1 ?????</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>?????????????</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4375,39 +4489,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>?????? %1???? %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>??????? %1?????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>??????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>?????? %1 ?????%2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>?????????%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>?? %1 ?????</translation>
</message>
@@ -4420,14 +4534,14 @@
<translation>???? %1 ??????????????!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation>??????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>????????????? %1</translation>
</message>
@@ -4435,49 +4549,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>????????? %1?????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>????? %1???????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>???????????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>??PIN?????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>?????????%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>?? %1 ?????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>???????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>????????????? %1</translation>
</message>
@@ -4534,39 +4648,39 @@
<translation>??? %1 ???? %2????%3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>?????????%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>?? %1 ?????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>?????????? HTTP ??? ??? 201? ??????? "%1 %2"?</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>???????????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>????????????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>??PIN?????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>???????metadata??????</translation>
</message>
@@ -4574,22 +4688,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>?????????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>%1?????????????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>??%1????????????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4597,11 +4700,6 @@
<translation>?? %1 ???????? ?????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>??????????%1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>??????????????????????????</translation>
@@ -4631,6 +4729,22 @@
<source>The file %1 is currently in use</source>
<translation>?? %1 ?????</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>??%1????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>??????????%1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4879,6 +4993,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>???????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>???????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>???????%1?????</translation>
@@ -4913,43 +5053,17 @@
<translation>????????????%1?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>??????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>?????...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>????????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>???????????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>???????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>?????</translation>
@@ -4965,11 +5079,6 @@
<translation>???????????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>??????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>??</translation>
@@ -4996,12 +5105,6 @@
<translation><numerusform>%1 ?????</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>??????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>???? ...</translation>
@@ -5031,6 +5134,17 @@
<source>Delete</source>
<translation>??</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>??????</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5132,13 +5246,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>?????????????????
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>??????%1</translation>
@@ -5158,6 +5265,13 @@
<source>The connection is not secure</source>
<translation>??????</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>?????????????????
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5250,6 +5364,32 @@
<translation>%1??????????%2????</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>???? %1 ????????? %2 ????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>???????????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>????????????????????%1????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>???????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>???????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>???????%1</translation>
@@ -5270,22 +5410,6 @@
<translation>???????????????: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>???????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>???? %1 ????????? %2 ????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>???????????????????????????????</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>?????????????????</translation>
@@ -5305,16 +5429,6 @@
<source>Cannot open the sync journal</source>
<translation>??????????</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>????????????????????%1????????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>???????????????????????</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5325,7 +5439,7 @@
<translation>??</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>?????????</translation>
</message>
@@ -5709,11 +5823,6 @@
<source>Less than a minute</source>
<translation>?????</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5721,20 +5830,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1 ??</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1 ??</numerusform></translation>
@@ -5749,6 +5848,21 @@
<source>%1 days</source>
<translation><numerusform>%1 ?</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation><numerusform>%n ??</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n ??</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n ?</numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5891,6 +6005,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>? %1 ??</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>?????????</translation>
@@ -5911,31 +6040,6 @@
<translation>???? %1 ????????????????????? %2 ???????????</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>? %1 ??</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>???????</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>?? %1?%2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>???</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>???????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5957,11 +6061,6 @@
<translation>macOS VFS for %1?????????</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>??????????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>???????%1?????</translation>
@@ -5972,6 +6071,21 @@
<translation>?????%1????</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>?? %1?%2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>???????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>?1??2??3?</translation>
@@ -5980,11 +6094,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>??????&L?</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>???</translation>
@@ -6020,22 +6129,11 @@
<translation>????????????????</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>??????????????</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>????????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>??????</translation>
@@ -6050,6 +6148,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>???????????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>??????&L?</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6090,6 +6204,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%n?</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>??</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%n??</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1??</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%n??</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>?????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1?%2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6130,55 +6289,10 @@
<source>Synced %1</source>
<translation>??? %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%n?</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>??</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%n??</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>??</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1??</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%n??</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>?????</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1?%2</translation>
+ <translation>?????????</translation>
</message>
<message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
@@ -6426,6 +6540,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>??????? "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>??????? "%1"</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>??????????? %1</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>?????????????</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6615,16 +6772,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6639,6 +6786,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6872,16 +7029,16 @@
<translation>???????</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>???????</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>??????</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>???????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>?????</translation>
@@ -6940,4 +7097,17 @@
<translation>????????</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>??????????????????????????????????????????????????????????????????????????</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/translations/client_zh_TW.ts nextcloud-desktop-3.16.6/translations/client_zh_TW.ts
--- nextcloud-desktop-3.16.4/translations/client_zh_TW.ts 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/translations/client_zh_TW.ts 2025-06-18 22:57:35.000000000 +0200
@@ -328,19 +328,6 @@
</message>
</context>
<context>
- <name>FileProviderFastEnumerationSettings</name>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
- <source>Enable fast sync</source>
- <translation>??????</translation>
- </message>
- <message>
- <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
- <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
- <translation>??????????????????????????????????????????????????????????????????????????</translation>
- </message>
-</context>
-<context>
<name>FileProviderFileDelegate</name>
<message>
<location filename="../src/gui/macOS/ui/FileProviderFileDelegate.qml" line="95"/>
@@ -365,6 +352,11 @@
<source>Enable virtual files</source>
<translation>??????</translation>
</message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderSettings.qml" line="103"/>
+ <source>Allow deletion of items in Trash</source>
+ <translation>???????????</translation>
+ </message>
</context>
<context>
<name>FileProviderStorageInfo</name>
@@ -558,7 +550,7 @@
</message>
<message>
<location filename="../src/gui/accountmanager.cpp" line="236"/>
- <location filename="../src/gui/accountmanager.cpp" line="282"/>
+ <location filename="../src/gui/accountmanager.cpp" line="286"/>
<source>Legacy import</source>
<translation>????</translation>
</message>
@@ -573,7 +565,7 @@
<translation>??</translation>
</message>
<message>
- <location filename="../src/gui/accountmanager.cpp" line="283"/>
+ <location filename="../src/gui/accountmanager.cpp" line="287"/>
<source>Could not import accounts from legacy client configuration.</source>
<translation>??????????????????</translation>
</message>
@@ -581,33 +573,11 @@
<context>
<name>OCC::AccountSettings</name>
<message>
- <location filename="../src/gui/accountsettings.ui" line="31"/>
- <source>Storage space: ?</source>
- <translation>??????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="85"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>??????????????????<b>??</b>???????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="124"/>
- <location filename="../src/gui/accountsettings.cpp" line="894"/>
- <location filename="../src/gui/accountsettings.cpp" line="1014"/>
- <source>Cancel</source>
- <translation>??</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="137"/>
- <source>Apply</source>
- <translation>??</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.ui" line="172"/>
- <source>Connected with <server> as <user></source>
- <translation>???? <server> ??? <user></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.ui" line="237"/>
<source>Synchronize all</source>
<translation>????</translation>
@@ -638,6 +608,33 @@
<translation>????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.ui" line="137"/>
+ <source>Apply</source>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="31"/>
+ <source>Storage space: ?</source>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="124"/>
+ <location filename="../src/gui/accountsettings.cpp" line="894"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1014"/>
+ <source>Cancel</source>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="172"/>
+ <source>Connected with <server> as <user></source>
+ <translation>???? <server> ??? <user></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>No account configured.</source>
+ <translation>??????</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="100"/>
<source>End-to-end Encryption with Virtual Files</source>
<translation>??????????</translation>
@@ -672,9 +669,9 @@
<b>????????????????</b></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="288"/>
- <source>No account configured.</source>
- <translation>??????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
+ <source>Forget encryption setup</source>
+ <translation>??????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
@@ -687,6 +684,11 @@
<translation>??????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
+ <source>Encryption is set-up. Remember to <b>Encrypt</b> a folder to end-to-end encrypt any new files added to it.</source>
+ <translation>?????????<b>??</b>?????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="323"/>
<source>End-to-end encryption has been enabled for this account</source>
<translation>???????????</translation>
@@ -712,6 +714,14 @@
<translation>???????????????????????</translation>
</message>
<message>
+ <location filename="../src/gui/accountsettings.cpp" line="409"/>
+ <source>You cannot encrypt this folder because the end-to-end encryption is not set-up yet on this device.
+Would you like to do this now?</source>
+ <translation>?????????????????????????
+???????
+</translation>
+ </message>
+ <message>
<location filename="../src/gui/accountsettings.cpp" line="417"/>
<source>End-to-end encryption is not configured on this device. Once it is configured, you will be able to encrypt this folder.
Would you like to set up end-to-end encryption?</source>
@@ -736,12 +746,6 @@
<translation>?????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="588"/>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
- <source>Open folder</source>
- <translation>?????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="607"/>
<source>Encrypt</source>
<translation>??</translation>
@@ -780,16 +784,6 @@
<translation>??????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Resume sync</source>
- <translation>????</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="707"/>
- <source>Pause sync</source>
- <translation>????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="710"/>
<source>Remove folder sync connection</source>
<translation>?????????</translation>
@@ -815,21 +809,11 @@
<translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="827"/>
- <source><p>Could not create local folder <i>%1</i>.</p></source>
- <translation><p>????????? <i>%1</i>?</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="886"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>???????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="887"/>
- <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
- <translation><p>??????????? <i>%1</i> ??</p><p><b>???</b>?<b>??</b>???????</p></translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="893"/>
<source>Remove Folder Sync Connection</source>
<translation>?????????</translation>
@@ -863,24 +847,24 @@
<translation>?????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1102"/>
- <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
- <translation>???????????????? 12 ??????????????????????????????????????????????????????????????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1093"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note it down and keep it safe. You will need it to set-up the synchronization of encrypted folders on your other devices.</source>
+ <translation>??????????????? 12 ??????????????????????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1127"/>
- <source>Disable end-to-end encryption</source>
- <translation>???????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1118"/>
+ <source>Forget the end-to-end encryption on this device</source>
+ <translation>????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1128"/>
- <source>Disable end-to-end encryption for %1?</source>
- <translation>?? %1 ???????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1119"/>
+ <source>Do you want to forget the end-to-end encryption settings for %1 on this device?</source>
+ <translation>?????????? %1 ?????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1129"/>
- <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
- <translation>???????????????????????<br>??????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1120"/>
+ <source>Forgetting end-to-end encryption will remove the sensitive data and all the encrypted files from this device.<br>However, the encrypted files will remain on the server and all your other devices, if configured.</source>
+ <translation>???????????????????????????<br>?????????????????????????????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1201"/>
@@ -893,34 +877,44 @@
<translation>?????????<br/>???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1274"/>
- <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
- <translation>??? %2 ?? %1?%3%????????????????????????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1287"/>
+ <source>%1 in use</source>
+ <translation>??? %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1275"/>
- <source>%1 of %2 in use</source>
- <translation>??? %2 ?? %1</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1541"/>
+ <source>Migrate certificate to a new one</source>
+ <translation>?????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1284"/>
- <source>Currently there is no storage usage information available.</source>
- <translation>??????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1648"/>
+ <source>There are folders that have grown in size beyond %1MB: %2</source>
+ <translation>??????????? %1MB?%2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1287"/>
- <source>%1 in use</source>
- <translation>??? %1</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1690"/>
+ <source>End-to-end encryption has been initialized on this account with another device.<br>Enter the unique mnemonic to have the encrypted folders synchronize on this device as well.</source>
+ <translation>????????????????????<br>???????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1314"/>
- <source>%1 as %2</source>
- <translation>%1 ??? %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1699"/>
+ <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
+ <translation>???????????????????<br>???????????????????<br>???????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1321"/>
- <source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation>????????? %1??????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1747"/>
+ <source>This account supports end-to-end encryption, but it needs to be set up first.</source>
+ <translation>??????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1762"/>
+ <source>Set up encryption</source>
+ <translation>????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1758"/>
+ <source>This account supports end-to-end encryption</source>
+ <translation>??????????</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1323"/>
@@ -938,79 +932,125 @@
<translation>??? %1 ??????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1333"/>
- <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
- <translation>??? %1 ??????????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/accountsettings.cpp" line="1336"/>
<source>Signed out from %1.</source>
<translation>?? %1 ???</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1339"/>
- <source>Connecting to %1 ?</source>
- <translation>????? %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1635"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation>???????????????? </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1343"/>
- <source>Unable to connect to %1.</source>
- <translation>????? %1?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1636"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation>??????????????????? </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1348"/>
- <source>Server configuration error: %1 at %2.</source>
- <translation>??????????%1 ? %2?</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1637"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation>??????????????????????????? </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1357"/>
- <source>You need to accept the terms of service at %1.</source>
- <translation>???? %1 ???????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="588"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>Open folder</source>
+ <translation>?????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1362"/>
- <source>No %1 connection configured.</source>
- <translation>??? %1 ?????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Resume sync</source>
+ <translation>????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1541"/>
- <source>Migrate certificate to a new one</source>
- <translation>?????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="707"/>
+ <source>Pause sync</source>
+ <translation>????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1635"/>
- <source>There are folders that were not synchronized because they are too big: </source>
- <translation>???????????????? </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="827"/>
+ <source><p>Could not create local folder <i>%1</i>.</p></source>
+ <translation><p>????????? <i>%1</i>?</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1636"/>
- <source>There are folders that were not synchronized because they are external storages: </source>
- <translation>??????????????????? </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="887"/>
+ <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
+ <translation><p>??????????? <i>%1</i> ??</p><p><b>???</b>?<b>??</b>???????</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1637"/>
- <source>There are folders that were not synchronized because they are too big or external storages: </source>
- <translation>??????????????????????????? </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1102"/>
+ <source>To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. Please note these down and keep them safe. They will be needed to add other devices to your account (like your mobile phone or laptop).</source>
+ <translation>???????????????? 12 ??????????????????????????????????????????????????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1648"/>
- <source>There are folders that have grown in size beyond %1MB: %2</source>
- <translation>??????????? %1MB?%2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1127"/>
+ <source>Disable end-to-end encryption</source>
+ <translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1699"/>
- <source>End-to-end encryption has been enabled on this account with another device.<br>It can be enabled on this device by entering your mnemonic.<br>This will enable synchronisation of existing encrypted folders.</source>
- <translation>???????????????????<br>???????????????????<br>???????????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1128"/>
+ <source>Disable end-to-end encryption for %1?</source>
+ <translation>?? %1 ???????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1758"/>
- <source>This account supports end-to-end encryption</source>
- <translation>??????????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1129"/>
+ <source>Removing end-to-end encryption will remove locally-synced files that are encrypted.<br>Encrypted files will remain on the server.</source>
+ <translation>???????????????????????<br>??????????????</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1762"/>
- <source>Set up encryption</source>
- <translation>????</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="1274"/>
+ <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
+ <translation>??? %2 ?? %1?%3%????????????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1275"/>
+ <source>%1 of %2 in use</source>
+ <translation>??? %2 ?? %1</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1284"/>
+ <source>Currently there is no storage usage information available.</source>
+ <translation>??????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1314"/>
+ <source>%1 as %2</source>
+ <translation>%1 ??? %2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1321"/>
+ <source>The server version %1 is unsupported! Proceed at your own risk.</source>
+ <translation>????????? %1??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1333"/>
+ <source>Server %1 is currently being redirected, or your connection is behind a captive portal.</source>
+ <translation>??? %1 ??????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1339"/>
+ <source>Connecting to %1 ?</source>
+ <translation>????? %1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1343"/>
+ <source>Unable to connect to %1.</source>
+ <translation>????? %1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1348"/>
+ <source>Server configuration error: %1 at %2.</source>
+ <translation>??????????%1 ? %2?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1357"/>
+ <source>You need to accept the terms of service at %1.</source>
+ <translation>???? %1 ???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="1362"/>
+ <source>No %1 connection configured.</source>
+ <translation>??? %1 ?????</translation>
</message>
</context>
<context>
@@ -1125,11 +1165,6 @@
<translation>????? (pkcs12)?</translation>
</message>
<message>
- <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
- <source>Browse ?</source>
- <translation>???</translation>
- </message>
- <message>
<location filename="../src/gui/addcertificatedialog.ui" line="60"/>
<source>Certificate password:</source>
<translation>?????</translation>
@@ -1140,6 +1175,11 @@
<translation>????????? pkcs12 ??????????????????</translation>
</message>
<message>
+ <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
+ <source>Browse ?</source>
+ <translation>???</translation>
+ </message>
+ <message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
<source>Select a certificate</source>
<translation>????</translation>
@@ -1190,34 +1230,34 @@
<translation>??</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="483"/>
+ <location filename="../src/gui/application.cpp" line="514"/>
<source>%1 accounts</source>
<comment>number of accounts imported</comment>
<translation>%1 ???</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="484"/>
+ <location filename="../src/gui/application.cpp" line="515"/>
<source>1 account</source>
<translation>1 ???</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="486"/>
+ <location filename="../src/gui/application.cpp" line="517"/>
<source>%1 folders</source>
<comment>number of folders imported</comment>
<translation>%1 ????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="487"/>
+ <location filename="../src/gui/application.cpp" line="518"/>
<source>1 folder</source>
<translation>1 ????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="489"/>
+ <location filename="../src/gui/application.cpp" line="520"/>
<source>Legacy import</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="490"/>
+ <location filename="../src/gui/application.cpp" line="521"/>
<source>Imported %1 and %2 from a legacy desktop client.
%3</source>
<comment>number of accounts and folders imported. list of users.</comment>
@@ -1225,12 +1265,12 @@
%3</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="580"/>
+ <location filename="../src/gui/application.cpp" line="610"/>
<source>Error accessing the configuration file</source>
<translation>????????????</translation>
</message>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="611"/>
<source>There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your system account.</source>
<translation>???? %1 ?????????????????????????????</translation>
</message>
@@ -1272,6 +1312,45 @@
</message>
</context>
<context>
+ <name>OCC::BulkPropagatorDownloadJob</name>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="151"/>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="152"/>
+ <source>File has changed since discovery</source>
+ <translation>?????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="164"/>
+ <source>Could not delete file record %1 from local DB</source>
+ <translation>?????????????? %1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="178"/>
+ <source>File %1 cannot be downloaded because it is non virtual!</source>
+ <translation>?????? %1???????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="229"/>
+ <source>Could not get file %1 from local DB</source>
+ <translation>???????????? %1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="244"/>
+ <source>File %1 cannot be downloaded because encryption information is missing.</source>
+ <translation>?????? %1??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="255"/>
+ <source>Error updating metadata: %1</source>
+ <translation>????????????%1</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/bulkpropagatordownloadjob.cpp" line="258"/>
+ <source>The file %1 is currently in use</source>
+ <translation>?? %1 ?????</translation>
+ </message>
+</context>
+<context>
<name>OCC::BulkPropagatorJob</name>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="150"/>
@@ -1279,6 +1358,11 @@
<translation>?????? %1????????????????????????</translation>
</message>
<message>
+ <location filename="../src/libsync/bulkpropagatorjob.cpp" line="182"/>
+ <source>File contains leading or trailing spaces and couldn't be renamed</source>
+ <translation>??????????????????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="209"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>?? %1 ?????????????????</translation>
@@ -1483,7 +1567,7 @@
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1710"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1738"/>
<source>Error writing metadata to the database</source>
<translation>???????????????</translation>
</message>
@@ -1613,21 +1697,6 @@
<context>
<name>OCC::ConflictSolver</name>
<message>
- <location filename="../src/gui/conflictsolver.cpp" line="89"/>
- <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
- <translation>???????????? <i>%1</i> ????????</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="90"/>
- <source>Do you want to delete the file <i>%1</i> permanently?</source>
- <translation>?????????? <i>%1</i> ??</translation>
- </message>
- <message>
- <location filename="../src/gui/conflictsolver.cpp" line="91"/>
- <source>Confirm deletion</source>
- <translation>????</translation>
- </message>
- <message>
<location filename="../src/gui/conflictsolver.cpp" line="135"/>
<location filename="../src/gui/conflictsolver.cpp" line="159"/>
<source>Error</source>
@@ -1643,30 +1712,30 @@
%1</translation>
</message>
-</context>
-<context>
- <name>OCC::ConnectionValidator</name>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
- <source>No Nextcloud account configured</source>
- <translation>???? Nextcloud ??</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="89"/>
+ <source>Do you want to delete the directory <i>%1</i> and all its contents permanently?</source>
+ <translation>???????????? <i>%1</i> ????????</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
- <source>Authentication error: Either username or password are wrong.</source>
- <translation>????????????????????</translation>
+ <location filename="../src/gui/conflictsolver.cpp" line="90"/>
+ <source>Do you want to delete the file <i>%1</i> permanently?</source>
+ <translation>?????????? <i>%1</i> ??</translation>
</message>
<message>
+ <location filename="../src/gui/conflictsolver.cpp" line="91"/>
+ <source>Confirm deletion</source>
+ <translation>????</translation>
+ </message>
+</context>
+<context>
+ <name>OCC::ConnectionValidator</name>
+ <message>
<location filename="../src/gui/connectionvalidator.cpp" line="183"/>
<source>Timeout</source>
<translation>??</translation>
</message>
<message>
- <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
- <source>The provided credentials are not correct</source>
- <translation>????????</translation>
- </message>
- <message>
<location filename="../src/gui/connectionvalidator.cpp" line="298"/>
<source>The configured server for this client is too old</source>
<translation>??????????????????</translation>
@@ -1676,16 +1745,31 @@
<source>Please update to the latest server and restart the client.</source>
<translation>??????????????????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="171"/>
+ <source>Authentication error: Either username or password are wrong.</source>
+ <translation>????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="54"/>
+ <source>No Nextcloud account configured</source>
+ <translation>???? Nextcloud ??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/connectionvalidator.cpp" line="220"/>
+ <source>The provided credentials are not correct</source>
+ <translation>????????</translation>
+ </message>
</context>
<context>
<name>OCC::DiscoveryPhase</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="197"/>
<source>Error while canceling deletion of a file</source>
<translation>???????????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="199"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="198"/>
<source>Error while canceling deletion of %1</source>
<translation>???? %1 ?????</translation>
</message>
@@ -1693,19 +1777,19 @@
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="653"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="686"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="652"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="685"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>??????PROPFIND ????? XML ???</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="716"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="753"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="715"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="752"/>
<source>Encrypted metadata setup error!</source>
<translation>?????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="740"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="739"/>
<source>Encrypted metadata setup error: initial signature from server is empty.</source>
<translation>????????????????????????</translation>
</message>
@@ -1713,27 +1797,27 @@
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="325"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="324"/>
<source>Error while opening directory %1</source>
<translation>???? %1 ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="327"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="326"/>
<source>Directory not accessible on client, permission denied</source>
<translation>??????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="331"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="330"/>
<source>Directory not found: %1</source>
<translation>??????%1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="362"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="361"/>
<source>Filename encoding is not valid</source>
<translation>????????</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="383"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="382"/>
<source>Error while reading directory %1</source>
<translation>???? %1 ?????</translation>
</message>
@@ -1973,11 +2057,6 @@
<context>
<name>OCC::Flow2Auth</name>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
- <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
- <translation>??? URL ?? HTTPS ??????? URL ??????????????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="219"/>
<source>The returned server URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
<translation>??? URL ?? HTTPS ?????????? URL ??????????????????????????????</translation>
@@ -1989,28 +2068,33 @@
<translation>????????<em>%1</em></translation>
</message>
<message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="102"/>
+ <source>The polling URL does not start with HTTPS despite the login URL started with HTTPS. Login will not be possible because this might be a security issue. Please contact your administrator.</source>
+ <translation>??? URL ?? HTTPS ??????? URL ??????????????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="116"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="234"/>
<source>There was an error accessing the "token" endpoint: <br><em>%1</em></source>
<translation>?????????????<br><em>%1</em></translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
- <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
- <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
- <translation>?????????? JSON?<br><em>%1</em></translation>
- </message>
- <message>
<location filename="../src/gui/creds/flow2auth.cpp" line="122"/>
<location filename="../src/gui/creds/flow2auth.cpp" line="240"/>
<source>The reply from the server did not contain all expected fields</source>
<translation>?????????????????</translation>
</message>
<message>
- <location filename="../src/gui/creds/flow2auth.cpp" line="268"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="258"/>
<source>The reply from the server did not contain all expected fields: <br><em>%1</em></source>
<translation>??????????????????<br><em>%1</em></translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="119"/>
+ <location filename="../src/gui/creds/flow2auth.cpp" line="237"/>
+ <source>Could not parse the JSON returned from the server: <br><em>%1</em></source>
+ <translation>?????????? JSON?<br><em>%1</em></translation>
+ </message>
</context>
<context>
<name>OCC::Flow2AuthWidget</name>
@@ -2053,6 +2137,34 @@
<context>
<name>OCC::Folder</name>
<message>
+ <location filename="../src/gui/folder.cpp" line="452"/>
+ <source>%1 has been removed.</source>
+ <comment>%1 names a file.</comment>
+ <translation>??? %1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="466"/>
+ <source>%1 has been updated.</source>
+ <comment>%1 names a file.</comment>
+ <translation>??? %1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="473"/>
+ <source>%1 has been renamed to %2.</source>
+ <comment>%1 and %2 name files.</comment>
+ <translation>%1 ?????? %2?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="480"/>
+ <source>%1 has been moved to %2.</source>
+ <translation>%1 ???? %2?</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/folder.cpp" line="450"/>
+ <source>%1 and %n other file(s) have been removed.</source>
+ <translation><numerusform>??? %1 ? %n ??????</numerusform></translation>
+ </message>
+ <message>
<location filename="../src/gui/folder.cpp" line="198"/>
<source>Please choose a different location. The folder %1 doesn't exist.</source>
<translation>??????????? %1 ????</translation>
@@ -2068,17 +2180,6 @@
<translation>????????%1 ??????????</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="450"/>
- <source>%1 and %n other file(s) have been removed.</source>
- <translation><numerusform>??? %1 ? %n ??????</numerusform></translation>
- </message>
- <message>
- <location filename="../src/gui/folder.cpp" line="452"/>
- <source>%1 has been removed.</source>
- <comment>%1 names a file.</comment>
- <translation>??? %1?</translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been added.</source>
<translation><numerusform>??? %1 ? %n ??????</numerusform></translation>
@@ -2094,33 +2195,16 @@
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>??? %1 ? %n ??????</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="466"/>
- <source>%1 has been updated.</source>
- <comment>%1 names a file.</comment>
- <translation>??? %1?</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ?????? %2??? %n ??????????</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="473"/>
- <source>%1 has been renamed to %2.</source>
- <comment>%1 and %2 name files.</comment>
- <translation>%1 ?????? %2?</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 ???? %2??? %n ????????</numerusform></translation>
</message>
- <message>
- <location filename="../src/gui/folder.cpp" line="480"/>
- <source>%1 has been moved to %2.</source>
- <translation>%1 ???? %2?</translation>
- </message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
@@ -2157,68 +2241,68 @@
<translation>??????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1092"/>
+ <location filename="../src/gui/folder.cpp" line="1112"/>
<source>Could not read system exclude file</source>
<translation>??????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1388"/>
+ <location filename="../src/gui/folder.cpp" line="1408"/>
<source>A new folder larger than %1 MB has been added: %2.
</source>
<translation>???? %1 MB ?????????%2
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1391"/>
+ <location filename="../src/gui/folder.cpp" line="1411"/>
<source>A folder from an external storage has been added.
</source>
<translation>????????????????
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1392"/>
+ <location filename="../src/gui/folder.cpp" line="1412"/>
<source>Please go in the settings to select it if you wish to download it.</source>
<translation>?????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1449"/>
+ <location filename="../src/gui/folder.cpp" line="1469"/>
<source>A folder has surpassed the set folder size limit of %1MB: %2.
%3</source>
<translation>???????????????? %1MB?%2?
%3</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1460"/>
+ <location filename="../src/gui/folder.cpp" line="1480"/>
<source>Keep syncing</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1468"/>
+ <location filename="../src/gui/folder.cpp" line="1488"/>
<source>Stop syncing</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1479"/>
+ <location filename="../src/gui/folder.cpp" line="1499"/>
<source>The folder %1 has surpassed the set folder size limit of %2MB.</source>
<translation>??? %1 ????????????? %2MB?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1480"/>
+ <location filename="../src/gui/folder.cpp" line="1500"/>
<source>Would you like to stop syncing this folder?</source>
<translation>?????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1555"/>
+ <location filename="../src/gui/folder.cpp" line="1575"/>
<source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source>
<translation>??? %1 ????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1558"/>
+ <location filename="../src/gui/folder.cpp" line="1578"/>
<source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source>
<translation>??? %1 ???????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1569"/>
+ <location filename="../src/gui/folder.cpp" line="1589"/>
<source>Changes in synchronized folders could not be tracked reliably.
This means that the synchronization client might not upload local changes immediately and will instead only scan for local changes and upload them occasionally (every two hours by default).
@@ -2231,12 +2315,12 @@
%1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1607"/>
+ <location filename="../src/gui/folder.cpp" line="1627"/>
<source>Virtual file download failed with code "%1", status "%2" and error message "%3"</source>
<translation>????????????%1?????%2???????%3?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1701"/>
+ <location filename="../src/gui/folder.cpp" line="1721"/>
<source>A large number of files in the server have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by uploading from '%1' folder to the server.</source>
@@ -2245,7 +2329,7 @@
?????????%1??????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1702"/>
+ <location filename="../src/gui/folder.cpp" line="1722"/>
<source>A large number of files in your local '%1' folder have been deleted.
Please confirm if you'd like to proceed with these deletions.
Alternatively, you can restore all deleted files by downloading them from the server.</source>
@@ -2254,22 +2338,22 @@
?????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1703"/>
+ <location filename="../src/gui/folder.cpp" line="1723"/>
<source>Remove all files?</source>
<translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1707"/>
+ <location filename="../src/gui/folder.cpp" line="1727"/>
<source>Proceed with Deletion</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files to Server</source>
<translation>????????</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1708"/>
+ <location filename="../src/gui/folder.cpp" line="1728"/>
<source>Restore Files from Server</source>
<translation>????????</translation>
</message>
@@ -2310,11 +2394,6 @@
<translation>?????????</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="428"/>
- <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
- <translation>????????????%1???????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1438"/>
<source> (backup)</source>
<translation> ????</translation>
@@ -2325,6 +2404,11 @@
<translation> ??? %1?</translation>
</message>
<message>
+ <location filename="../src/gui/folderman.cpp" line="428"/>
+ <source>An old sync journal "%1" was found, but could not be removed. Please make sure that no application is currently using it.</source>
+ <translation>????????????%1???????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderman.cpp" line="1783"/>
<source>Undefined state.</source>
<translation>??????</translation>
@@ -2395,16 +2479,6 @@
<translation>????????</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1840"/>
- <source>Sync is paused.</source>
- <translation>??????</translation>
- </message>
- <message>
- <location filename="../src/gui/folderman.cpp" line="1846"/>
- <source>%1 (Sync is paused)</source>
- <translation>%1???????</translation>
- </message>
- <message>
<location filename="../src/gui/folderman.cpp" line="1854"/>
<source>Please choose a different location. The selected folder isn't valid.</source>
<translation>?????????????????</translation>
@@ -2454,6 +2528,16 @@
????????????????? %1?????????????
?????????????????????????????????????? %1 ?????????? sync_*.db ????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1840"/>
+ <source>Sync is paused.</source>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderman.cpp" line="1846"/>
+ <source>%1 (Sync is paused)</source>
+ <translation>%1???????</translation>
+ </message>
</context>
<context>
<name>OCC::FolderStatusDelegate</name>
@@ -2497,16 +2581,6 @@
<translation>??????????????????</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
- <source>Fetching folder list from server ?</source>
- <translation>??????????????</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
- <source>There are unresolved conflicts. Click for details.</source>
- <translation>??????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="263"/>
<source>Virtual file support is enabled.</source>
<translation>??????????</translation>
@@ -2548,16 +2622,31 @@
<translation>%1 %2??</translation>
</message>
<message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
+ <source>Download %1/s</source>
+ <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
+ <translation>?? %1??</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
+ <source>File %1 of %2</source>
+ <translation>? %1 ????? %2 ?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="250"/>
+ <source>There are unresolved conflicts. Click for details.</source>
+ <translation>??????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1066"/>
<location filename="../src/gui/folderstatusmodel.cpp" line="1077"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1070"/>
- <source>Download %1/s</source>
- <extracomment>Example text: "Download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation>?? %1??</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="224"/>
+ <source>Fetching folder list from server ?</source>
+ <translation>??????????????</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1072"/>
@@ -2604,21 +2693,16 @@
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 / %2??? %3 / %4</translation>
</message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1136"/>
- <source>File %1 of %2</source>
- <translation>? %1 ????? %2 ?</translation>
+ <message numerus="yes">
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
+ <source>Waiting for %n other folder(s) ?</source>
+ <translation><numerusform>?????? %n ?????</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
<source>About to start syncing</source>
<translation>??????</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="1189"/>
- <source>Waiting for %n other folder(s) ?</source>
- <translation><numerusform>?????? %n ?????</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="1194"/>
<source>Preparing to sync ?</source>
@@ -2778,11 +2862,6 @@
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="26"/>
- <source>&Launch on System Startup</source>
- <translation>?????????(&L)</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="33"/>
<source>Show Call Notifications</source>
<translation>??????</translation>
@@ -2793,11 +2872,6 @@
<translation>?????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="43"/>
- <source>Use &Monochrome Icons</source>
- <translation>??????(&M)</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="50"/>
<source>Show Chat Notifications</source>
<translation>??????</translation>
@@ -2813,17 +2887,32 @@
<translation>??</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="80"/>
- <source>Ask for confirmation before synchronizing new folders larger than</source>
- <translation>??????????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="116"/>
<source>MB</source>
<extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation>????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="26"/>
+ <source>&Launch on System Startup</source>
+ <translation>?????????(&L)</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="43"/>
+ <source>Use &Monochrome Icons</source>
+ <translation>??????(&M)</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="80"/>
+ <source>Ask for confirmation before synchronizing new folders larger than</source>
+ <translation>??????????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.ui" line="143"/>
<source>Notify when synchronised folders grow larger than specified limit</source>
<translation>?????????????????????</translation>
@@ -2834,11 +2923,6 @@
<translation>??????????????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
- <source>Ask for confirmation before synchronizing external storages</source>
- <translation>????????????????</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="194"/>
<source>Move removed files to trash</source>
<translation>????????????</translation>
@@ -2890,11 +2974,6 @@
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="395"/>
- <source>&Restart && Update</source>
- <translation>???????(&R)</translation>
- </message>
- <message>
<location filename="../src/gui/generalsettings.ui" line="412"/>
<source>&Automatically check for updates</source>
<translation>??????(&A)</translation>
@@ -2915,6 +2994,16 @@
<translation>????</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="455"/>
+ <source>Restore &Default</source>
+ <translation>??????(&D)</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="395"/>
+ <source>&Restart && Update</source>
+ <translation>???????(&R)</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="196"/>
<source>Server notifications that require attention.</source>
<translation>???????????</translation>
@@ -2935,6 +3024,11 @@
<translation>?????????????????????????</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.cpp" line="343"/>
+ <source>Restore to &%1</source>
+ <translation>??? &%1</translation>
+ </message>
+ <message>
<location filename="../src/gui/generalsettings.cpp" line="413"/>
<source>stable</source>
<translation>???</translation>
@@ -3016,6 +3110,11 @@
<source>Debug archive is created at %1</source>
<translation>??????? %1 ??</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.cpp" line="637"/>
+ <source>Redact information deemed sensitive before sharing! Debug archive created at %1</source>
+ <translation>?????????????? %1 ???????</translation>
+ </message>
</context>
<context>
<name>OCC::GetOrCreatePublicLinkShare</name>
@@ -3180,102 +3279,97 @@
<translation>?????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="92"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="94"/>
<source>Rename file</source>
<translation>??????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="99"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="101"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on this system.</source>
<translation>???????%1???????????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="100"/>
- <source>The following characters are not allowed on the system: * " | & ? , ; : \ / ~ < > leading/trailing spaces</source>
- <translation>??????????* " | & ? , ; : \ / ~ < > ?????????</translation>
- </message>
- <message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="102"/>
<source>The following characters are not allowed on the system: \ / : ? * " < > | leading/trailing spaces</source>
<translation>????????????\ / : ? * " < > | ?????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="103"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>The file "%1" could not be synced because the name contains characters which are not allowed on the server.</source>
<translation>???????%1????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="114"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="116"/>
<source>The following characters are not allowed: %1</source>
<translation>????????%1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="117"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="119"/>
<source>The following basenames are not allowed: %1</source>
<translation>????????????%1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="120"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="122"/>
<source>The following filenames are not allowed: %1</source>
<translation>????????????%1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="123"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="125"/>
<source>The following file extensions are not allowed: %1</source>
<translation>???????????%1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="134"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="136"/>
<source>Checking rename permissions ?</source>
<translation>?????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="169"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="170"/>
<source>You don't have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation>??????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="174"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="175"/>
<source>Failed to fetch permissions with error %1</source>
<translation>????????? %1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="191"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="192"/>
<source>Filename contains leading and trailing spaces.</source>
<translation>???????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="194"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="195"/>
<source>Filename contains leading spaces.</source>
<translation>????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="196"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="197"/>
<source>Filename contains trailing spaces.</source>
<translation>????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="201"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="202"/>
<source>Use invalid name</source>
<translation>???????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="256"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="258"/>
<source>Filename contains illegal characters: %1</source>
<translation>?????????????%1</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="269"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="271"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation>?????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="280"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="282"/>
<source>Cannot rename file because a file with the same name does already exist on the server. Please pick another name.</source>
<translation>???????????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/invalidfilenamedialog.cpp" line="316"/>
+ <location filename="../src/gui/invalidfilenamedialog.cpp" line="318"/>
<source>Could not rename local file. %1</source>
<translation>???????????%1</translation>
</message>
@@ -3399,16 +3493,6 @@
<translation><p>%1 ?????????</p><p><b>%2</b> ????????????? %3?</p></translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
- <source>Skip this time</source>
- <translation>??????</translation>
- </message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
- <source>Get update</source>
- <translation>????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="455"/>
<source>Update Failed</source>
<translation>????</translation>
@@ -3433,6 +3517,16 @@
<source>Update manually</source>
<translation>????</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="427"/>
+ <source>Skip this time</source>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="428"/>
+ <source>Get update</source>
+ <translation>????</translation>
+ </message>
</context>
<context>
<name>OCC::NetworkSettings</name>
@@ -3457,6 +3551,23 @@
<translation>?????????</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="312"/>
+ <source>Download Bandwidth</source>
+ <translation>????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="383"/>
+ <location filename="../src/gui/networksettings.ui" line="460"/>
+ <source>Limit to</source>
+ <translation>???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/networksettings.ui" line="361"/>
+ <location filename="../src/gui/networksettings.ui" line="501"/>
+ <source>KBytes/s</source>
+ <translation>KB/?</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="224"/>
<source>Note: proxy settings have no effects for accounts on localhost</source>
<translation>???????????? localhost ????????</translation>
@@ -3479,46 +3590,29 @@
<translation>??????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="312"/>
- <source>Download Bandwidth</source>
- <translation>????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="330"/>
<location filename="../src/gui/networksettings.ui" line="467"/>
<source>No limit</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="361"/>
- <location filename="../src/gui/networksettings.ui" line="501"/>
- <source>KBytes/s</source>
- <translation>KB/?</translation>
- </message>
- <message>
- <location filename="../src/gui/networksettings.ui" line="383"/>
- <location filename="../src/gui/networksettings.ui" line="460"/>
- <source>Limit to</source>
- <translation>???</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.ui" line="390"/>
<location filename="../src/gui/networksettings.ui" line="437"/>
<source>Limit to 3/4 of estimated bandwidth</source>
<translation>???????? 3/4</translation>
</message>
<message>
+ <location filename="../src/gui/networksettings.ui" line="416"/>
+ <source>Upload Bandwidth</source>
+ <translation>????</translation>
+ </message>
+ <message>
<location filename="../src/gui/networksettings.ui" line="393"/>
<location filename="../src/gui/networksettings.ui" line="440"/>
<source>Limit automatically</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/networksettings.ui" line="416"/>
- <source>Upload Bandwidth</source>
- <translation>????</translation>
- </message>
- <message>
<location filename="../src/gui/networksettings.cpp" line="50"/>
<source>Hostname of proxy server</source>
<translation>?????????</translation>
@@ -3547,6 +3641,16 @@
<context>
<name>OCC::OCUpdater</name>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
+ <source>Could not check for new updates.</source>
+ <translation>????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>Checking update server ?</source>
+ <translation>??????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="107"/>
<source>New %1 update ready</source>
<translation>?? %1 ?????</translation>
@@ -3577,11 +3681,6 @@
<translation>?????????? %1 ????????</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="162"/>
- <source>Could not check for new updates.</source>
- <translation>????????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="165"/>
<source>New %1 is available. Please open <a href='%2'>%2</a> to download the update.</source>
<translation>??? %1 ??????? <a href='%2'>%2</a> ?????</translation>
@@ -3592,16 +3691,21 @@
<translation>??? %1 ??????? %2 ?????</translation>
</message>
<message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
- <source>Checking update server ?</source>
- <translation>??????????</translation>
- </message>
- <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="172"/>
<source>Update status is unknown: Did not check for new updates.</source>
<translation>??????????????????</translation>
</message>
<message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="170"/>
+ <source>You are using the %1 update channel. Your installation is the latest version.</source>
+ <translation>????? %1 ???????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="174"/>
+ <source>No updates available. Your installation is the latest version.</source>
+ <translation>????????????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/updater/ocupdater.cpp" line="176"/>
<source>No updates available. Your installation is at the latest version.</source>
<translation>???????????????????????</translation>
@@ -3777,11 +3881,6 @@
<translation><font color="green">????? %1?%2 ?? %3?%4?</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
- <source>Invalid URL</source>
- <translation>URL ????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="310"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>?????? %2 ? %1?<br/>%3</translation>
@@ -3792,6 +3891,16 @@
<translation>????? %2 ? %1 ???</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
+ <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
+ <translation>?????????????????????<a href="%1">?????</a>??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="308"/>
+ <source>Invalid URL</source>
+ <translation>URL ????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="365"/>
<source>Trying to connect to %1 at %2 ?</source>
<translation>????? %2 ? %1?</translation>
@@ -3802,11 +3911,6 @@
<translation>??????????????%1?????????????????????????</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="446"/>
- <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
- <translation>?????????????????????<a href="%1">?????</a>??????????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="455"/>
<source>There was an invalid response to an authenticated WebDAV request</source>
<translation>????? WebDAV ??????</translation>
@@ -4018,62 +4122,34 @@
<translation>??????????.????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>Folder</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>???</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="421"/>
- <source>File</source>
- <comment>name of folder entity to use when warning about invalid name</comment>
- <translation>??</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <location filename="../src/libsync/discovery.cpp" line="406"/>
<source>Folder names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation>???????????%1??????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="423"/>
- <source>%1 name containing the character "%2" is not supported on this file system.</source>
- <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
- <translation>?????????????%2?? %1 ???</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="424"/>
+ <location filename="../src/libsync/discovery.cpp" line="407"/>
<source>File names containing the character "%1" are not supported on this file system.</source>
<comment>%1: the invalid character</comment>
<translation>???????????%1?????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="425"/>
- <source>%1 name contains at least one invalid character</source>
- <translation>%1 ????????????</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <location filename="../src/libsync/discovery.cpp" line="410"/>
<source>Folder name contains at least one invalid character</source>
<translation>????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="427"/>
- <source>%1 name is a reserved name on this file system.</source>
- <translation>%1 ???????????????</translation>
- </message>
- <message>
- <location filename="../src/libsync/discovery.cpp" line="428"/>
+ <location filename="../src/libsync/discovery.cpp" line="411"/>
<source>File name contains at least one invalid character</source>
<translation>???????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="431"/>
+ <location filename="../src/libsync/discovery.cpp" line="414"/>
<source>Folder name is a reserved name on this file system.</source>
<translation>??????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="432"/>
+ <location filename="../src/libsync/discovery.cpp" line="415"/>
<source>File name is a reserved name on this file system.</source>
<translation>?????????????????</translation>
</message>
@@ -4083,6 +4159,24 @@
<translation>????????????</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>Folder</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>???</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="421"/>
+ <source>File</source>
+ <comment>name of folder entity to use when warning about invalid name</comment>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="423"/>
+ <source>%1 name containing the character "%2" is not supported on this file system.</source>
+ <comment>folder or file impossible to sync due to an invalid name, placeholders will be file or folder and the invalid character</comment>
+ <translation>?????????????%2?? %1 ???</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="436"/>
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="450"/>
@@ -4091,6 +4185,16 @@
<translation>??????????</translation>
</message>
<message>
+ <location filename="../src/libsync/discovery.cpp" line="425"/>
+ <source>%1 name contains at least one invalid character</source>
+ <translation>%1 ????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="427"/>
+ <source>%1 name is a reserved name on this file system.</source>
+ <translation>%1 ???????????????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/discovery.cpp" line="440"/>
<source>Filename contains leading spaces.</source>
<translation>????????????</translation>
@@ -4181,64 +4285,74 @@
<translation>??????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1128"/>
+ <location filename="../src/libsync/discovery.cpp" line="1138"/>
<source>Cannot sync due to invalid modification time</source>
<translation>?????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1138"/>
+ <location filename="../src/libsync/discovery.cpp" line="1185"/>
+ <source>Upload of %1 exceeds %2 of space left in personal files.</source>
+ <translation>%1 ???????????????? %2?</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1188"/>
+ <source>Upload of %1 exceeds %2 of space left in folder %3.</source>
+ <translation>%1 ????????? %3 ??????? %2?</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/discovery.cpp" line="1148"/>
<source>Could not upload file, because it is open in "%1".</source>
<translation>????????????%1????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1181"/>
+ <location filename="../src/libsync/discovery.cpp" line="1191"/>
<source>Error while deleting file record %1 from the database</source>
<translation>?????????? %1 ?????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1459"/>
- <location filename="../src/libsync/discovery.cpp" line="1915"/>
+ <location filename="../src/libsync/discovery.cpp" line="1469"/>
+ <location filename="../src/libsync/discovery.cpp" line="1925"/>
<source>Moved to invalid target, restoring</source>
<translation>????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1777"/>
+ <location filename="../src/libsync/discovery.cpp" line="1787"/>
<source>Cannot modify encrypted item because the selected certificate is not valid.</source>
<translation>?????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1839"/>
+ <location filename="../src/libsync/discovery.cpp" line="1849"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1873"/>
- <location filename="../src/libsync/discovery.cpp" line="2076"/>
+ <location filename="../src/libsync/discovery.cpp" line="1883"/>
+ <location filename="../src/libsync/discovery.cpp" line="2086"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>??????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1879"/>
+ <location filename="../src/libsync/discovery.cpp" line="1889"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1893"/>
+ <location filename="../src/libsync/discovery.cpp" line="1903"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>???????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1929"/>
+ <location filename="../src/libsync/discovery.cpp" line="1939"/>
<source>Not allowed to remove, restoring</source>
<translation>??????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2119"/>
+ <location filename="../src/libsync/discovery.cpp" line="2129"/>
<source>Error while reading the database</source>
<translation>??????????</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="2204"/>
+ <location filename="../src/libsync/discovery.cpp" line="2214"/>
<source>Server replied with an error while reading directory "%1" : %2</source>
<translation>?????????%1??????%2</translation>
</message>
@@ -4246,38 +4360,38 @@
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1420"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1438"/>
<source>Could not delete file %1 from local DB</source>
<translation>????????????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1434"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1452"/>
<source>Error updating metadata due to invalid modification time</source>
<translation>????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1464"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1470"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1498"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1504"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1485"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1491"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1526"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>?????? %1 ?????%2</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1476"/>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1510"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1497"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1532"/>
<source>unknown exception</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1520"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1542"/>
<source>Error updating metadata: %1</source>
<translation>????????????%1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="1524"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="1546"/>
<source>File is currently in use</source>
<translation>?????????</translation>
</message>
@@ -4295,12 +4409,6 @@
<translation>?? %1 ??????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
- <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
- <source>File has changed since discovery</source>
- <translation>????????????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagatedownload.cpp" line="518"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1376"/>
<source>Could not delete file record %1 from local DB</source>
@@ -4357,6 +4465,12 @@
<source>The file %1 is currently in use</source>
<translation>?? %1 ???????</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="497"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="1326"/>
+ <source>File has changed since discovery</source>
+ <translation>????????????</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateItemJob</name>
@@ -4374,39 +4488,39 @@
<context>
<name>OCC::PropagateLocalMkdir</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="171"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="205"/>
<source>could not delete file %1, error: %2</source>
<translation>?????? %1????%2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="186"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="220"/>
<source>Folder %1 cannot be created because of a local file or folder name clash!</source>
<translation>??????? %1?????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="218"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="252"/>
<source>Could not create folder %1</source>
<translation>??????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="231"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="237"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="265"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="271"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>The folder %1 cannot be made read-only: %2</source>
<translation>?????? %1 ?????%2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="243"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="277"/>
<source>unknown exception</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="276"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="310"/>
<source>Error updating metadata: %1</source>
<translation>????????????%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="279"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="313"/>
<source>The file %1 is currently in use</source>
<translation>?? %1 ???????</translation>
</message>
@@ -4419,14 +4533,14 @@
<translation>?????? %1????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="119"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="130"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="145"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="154"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="164"/>
<source>Temporary error when removing local item removed from server.</source>
<translation>??????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="139"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="173"/>
<source>Could not delete file record %1 from local DB</source>
<translation>?????????????? %1</translation>
</message>
@@ -4434,49 +4548,49 @@
<context>
<name>OCC::PropagateLocalRename</name>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="336"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="370"/>
<source>Folder %1 cannot be renamed because of a local file or folder name clash!</source>
<translation>???????????????????????? %1?</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="344"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="378"/>
<source>File %1 downloaded but it resulted in a local file name clash!</source>
<translation>????? %1??????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="444"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="531"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="478"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="565"/>
<source>Could not get file %1 from local DB</source>
<translation>???????????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="457"/>
- <location filename="../src/libsync/propagatorjobs.cpp" line="518"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="491"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="552"/>
<source>Error setting pin state</source>
<translation>???????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="470"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="504"/>
<source>Error updating metadata: %1</source>
<translation>????????????%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="473"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="507"/>
<source>The file %1 is currently in use</source>
<translation>?? %1 ???????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="508"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="542"/>
<source>Failed to propagate directory rename in hierarchy</source>
<translation>????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="513"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="547"/>
<source>Failed to rename file</source>
<translation>????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="536"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="570"/>
<source>Could not delete file record %1 from local DB</source>
<translation>?????????????? %1</translation>
</message>
@@ -4533,39 +4647,39 @@
<translation>??? %1 ????? %2????%3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="225"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="295"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="227"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="297"/>
<source>Error updating metadata: %1</source>
<translation>????????????%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="228"/>
- <location filename="../src/libsync/propagateremotemove.cpp" line="298"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="230"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="300"/>
<source>The file %1 is currently in use</source>
<translation>?? %1 ???????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="242"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="244"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>???????? HTTP ?????? 201???????%1 %2??</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="263"/>
<source>Could not get file %1 from local DB</source>
<translation>???????????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="273"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="275"/>
<source>Could not delete file record %1 from local DB</source>
<translation>?????????????? %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="304"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="306"/>
<source>Error setting pin state</source>
<translation>???????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="311"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="313"/>
<source>Error writing metadata to the database</source>
<translation>????????????????</translation>
</message>
@@ -4573,22 +4687,11 @@
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="252"/>
- <source>Failed to upload encrypted file.</source>
- <translation>???????????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="287"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>?????? %1???????????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="298"/>
- <location filename="../src/libsync/propagateupload.cpp" line="729"/>
- <source>Upload of %1 exceeds the quota for the folder</source>
- <translation>?? %1 ????????????</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="342"/>
<location filename="../src/libsync/propagateupload.cpp" line="418"/>
<location filename="../src/libsync/propagateupload.cpp" line="431"/>
@@ -4596,11 +4699,6 @@
<translation>?? %1 ?????????????????</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="415"/>
- <source>File Removed (start upload) %1</source>
- <translation>???????????%1</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="441"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>??????????????????????</translation>
@@ -4630,6 +4728,22 @@
<source>The file %1 is currently in use</source>
<translation>?? %1 ???????</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="298"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="729"/>
+ <source>Upload of %1 exceeds the quota for the folder</source>
+ <translation>?? %1 ????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="252"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation>???????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="415"/>
+ <source>File Removed (start upload) %1</source>
+ <translation>???????????%1</translation>
+ </message>
</context>
<context>
<name>OCC::PropagateUploadFileNG</name>
@@ -4878,6 +4992,32 @@
<context>
<name>OCC::SocketApi</name>
<message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
+ <source>Context menu share</source>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
+ <source>I shared something with you</source>
+ <translation>??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
+ <source>Share options</source>
+ <translation>????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
+ <source>Send private link by email ?</source>
+ <translation>?????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
+ <source>Copy private link to clipboard</source>
+ <translation>???????????</translation>
+ </message>
+ <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="551"/>
<source>Failed to encrypt folder at "%1"</source>
<translation>??????%1?????</translation>
@@ -4912,43 +5052,17 @@
<translation>???????????%1?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="785"/>
- <source>Context menu share</source>
- <translation>??????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1061"/>
<source>Select new location ?</source>
<translation>??????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1134"/>
- <source>I shared something with you</source>
- <translation>??????????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1147"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1184"/>
- <source>Share options</source>
- <translation>????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1148"/>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1364"/>
<source>Activity</source>
<translation>????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1150"/>
- <source>Copy private link to clipboard</source>
- <translation>???????????</translation>
- </message>
- <message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1151"/>
- <source>Send private link by email ?</source>
- <translation>?????????????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1176"/>
<source>Leave this share</source>
<translation>?????</translation>
@@ -4964,11 +5078,6 @@
<translation>???????????</translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
- <source>Copy internal link</source>
- <translation>??????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1226"/>
<source>Encrypt</source>
<translation>??</translation>
@@ -4995,12 +5104,6 @@
<translation><numerusform>%1 ?????</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
- <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
- <source>Open in browser</source>
- <translation>??????</translation>
- </message>
- <message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1399"/>
<source>Resolve conflict ?</source>
<translation>?????</translation>
@@ -5030,6 +5133,17 @@
<source>Delete</source>
<translation>??</translation>
</message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1188"/>
+ <source>Copy internal link</source>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1370"/>
+ <location filename="../src/gui/socketapi/socketapi.cpp" line="1372"/>
+ <source>Open in browser</source>
+ <translation>??????</translation>
+ </message>
</context>
<context>
<name>OCC::SslButton</name>
@@ -5131,13 +5245,6 @@
</translation>
</message>
<message>
- <location filename="../src/gui/sslbutton.cpp" line="177"/>
- <source>This connection is NOT secure as it is not encrypted.
-</source>
- <translation>??????????????
-</translation>
- </message>
- <message>
<location filename="../src/gui/sslbutton.cpp" line="191"/>
<source>Server version: %1</source>
<translation>??????%1</translation>
@@ -5157,6 +5264,13 @@
<source>The connection is not secure</source>
<translation>??????</translation>
</message>
+ <message>
+ <location filename="../src/gui/sslbutton.cpp" line="177"/>
+ <source>This connection is NOT secure as it is not encrypted.
+</source>
+ <translation>??????????????
+</translation>
+ </message>
</context>
<context>
<name>OCC::SslErrorDialog</name>
@@ -5249,6 +5363,32 @@
<translation>%1??????????%2 ????</translation>
</message>
<message>
+ <location filename="../src/libsync/syncengine.cpp" line="567"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
+ <translation>???? %1 ????????? %2 ????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="600"/>
+ <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
+ <translation>??????????????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1446"/>
+ <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
+ <translation>??????????????????? %1 ??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="1453"/>
+ <source>There is insufficient space available on the server for some uploads.</source>
+ <translation>???????????????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
+ <source>Unresolved conflict.</source>
+ <translation>???????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/syncengine.cpp" line="383"/>
<source>Could not update file: %1</source>
<translation>???????%1</translation>
@@ -5269,22 +5409,6 @@
<translation>????????????????%1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="465"/>
- <source>Unresolved conflict.</source>
- <translation>???????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="567"/>
- <source>Only %1 are available, need at least %2 to start</source>
- <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
- <translation>???? %1 ????????? %2 ????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="600"/>
- <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
- <translation>??????????????????????????????</translation>
- </message>
- <message>
<location filename="../src/libsync/syncengine.cpp" line="616"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>???????????????????</translation>
@@ -5304,16 +5428,6 @@
<source>Cannot open the sync journal</source>
<translation>????????</translation>
</message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1446"/>
- <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
- <translation>??????????????????? %1 ??????????</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="1453"/>
- <source>There is insufficient space available on the server for some uploads.</source>
- <translation>???????????????????????</translation>
- </message>
</context>
<context>
<name>OCC::SyncStatusSummary</name>
@@ -5324,7 +5438,7 @@
<translation>??</translation>
</message>
<message>
- <location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
+ <location filename="../src/gui/tray/syncstatussummary.cpp" line="128"/>
<source>You need to accept the terms of service</source>
<translation>?????????</translation>
</message>
@@ -5708,11 +5822,6 @@
<source>Less than a minute</source>
<translation>?? 1 ??</translation>
</message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="413"/>
- <source>%n minute(s)</source>
- <translation><numerusform>%n??</numerusform></translation>
- </message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="414"/>
<source>1 minute</source>
@@ -5720,20 +5829,10 @@
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
- <source>%n hour(s)</source>
- <translation><numerusform>%n??</numerusform></translation>
- </message>
- <message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation><numerusform>%1??</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/userstatusselectormodel.cpp" line="419"/>
- <source>%n day(s)</source>
- <translation><numerusform>%n?</numerusform></translation>
- </message>
- <message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation><numerusform>%1??</numerusform></translation>
@@ -5748,6 +5847,21 @@
<source>%1 days</source>
<translation><numerusform>%1?</numerusform></translation>
</message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="404"/>
+ <source>%n minute(s)</source>
+ <translation><numerusform>%n??</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="407"/>
+ <source>%n hour(s)</source>
+ <translation><numerusform>%n??</numerusform></translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/gui/userstatusselectormodel.cpp" line="410"/>
+ <source>%n day(s)</source>
+ <translation><numerusform>%n?</numerusform></translation>
+ </message>
</context>
<context>
<name>OCC::Vfs</name>
@@ -5890,6 +6004,21 @@
<context>
<name>OCC::ownCloudGui</name>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="383"/>
+ <source>Please sign in</source>
+ <translation>???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="469"/>
+ <source>There are no sync folders configured.</source>
+ <translation>????????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="364"/>
+ <source>Disconnected from %1</source>
+ <translation>? %1 ????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="271"/>
<source>Unsupported Server Version</source>
<translation>?????????</translation>
@@ -5910,31 +6039,6 @@
<translation>???? %1 ????????????????????? %2 ???????????</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="364"/>
- <source>Disconnected from %1</source>
- <translation>? %1 ????</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
- <source>Disconnected from accounts:</source>
- <translation>????????</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="369"/>
- <source>Account %1: %2</source>
- <translation>?? %1?%2</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="383"/>
- <source>Please sign in</source>
- <translation>???</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="387"/>
- <source>Account synchronization is disabled</source>
- <translation>???????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="452"/>
<source>%1: %2</source>
<extracomment>Example text: "Nextcloud: Syncing 25MB (3 minutes left)" (%1 is the folder name to be synced, %2 a status message for that folder)</extracomment>
@@ -5956,11 +6060,6 @@
<translation>?1 ? macOS VFS??????</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="469"/>
- <source>There are no sync folders configured.</source>
- <translation>????????????</translation>
- </message>
- <message>
<location filename="../src/gui/owncloudgui.cpp" line="528"/>
<source>Checking for changes in remote "%1"</source>
<translation>???????%1?????</translation>
@@ -5971,6 +6070,21 @@
<translation>???????%1?????</translation>
</message>
<message>
+ <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <source>Disconnected from accounts:</source>
+ <translation>????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="369"/>
+ <source>Account %1: %2</source>
+ <translation>?? %1?%2</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="387"/>
+ <source>Account synchronization is disabled</source>
+ <translation>???????</translation>
+ </message>
+ <message>
<location filename="../src/gui/owncloudgui.cpp" line="548"/>
<source>%1 (%2, %3)</source>
<translation>%1?%2?%3?</translation>
@@ -5979,11 +6093,6 @@
<context>
<name>OwncloudAdvancedSetupPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
- <source>&Local Folder</source>
- <translation>?????(&L)</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="98"/>
<source>Username</source>
<translation>?????</translation>
@@ -6019,22 +6128,11 @@
<translation>?????????????????</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
- <source>MB</source>
- <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
- <translation>MB</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="432"/>
<source>Ask before syncing external storages</source>
<translation>??????????????</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
- <source>Choose what to sync</source>
- <translation>????????</translation>
- </message>
- <message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="612"/>
<source>Keep local data</source>
<translation>??????</translation>
@@ -6049,6 +6147,22 @@
<source>Erase local folder and start a clean sync</source>
<translation>??????????????</translation>
</message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="475"/>
+ <source>Choose what to sync</source>
+ <translation>????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="77"/>
+ <source>&Local Folder</source>
+ <translation>?????(&L)</translation>
+ </message>
</context>
<context>
<name>OwncloudHttpCredsPage</name>
@@ -6089,6 +6203,51 @@
</context>
<context>
<name>QObject</name>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="440"/>
+ <source>%nd</source>
+ <comment>delay in days after an activity</comment>
+ <translation><numerusform>%n ?</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="444"/>
+ <source>in the future</source>
+ <translation>???</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="449"/>
+ <source>%nh</source>
+ <comment>delay in hours after an activity</comment>
+ <translation><numerusform>%n ??</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="457"/>
+ <source>1m</source>
+ <comment>one minute after activity date and time</comment>
+ <translation>1 ??</translation>
+ </message>
+ <message numerus="yes">
+ <location filename="../src/common/utility.cpp" line="460"/>
+ <source>%nm</source>
+ <comment>delay in minutes after an activity</comment>
+ <translation><numerusform>%n ??</numerusform></translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="455"/>
+ <source>now</source>
+ <translation>??</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="464"/>
+ <source>Some time ago</source>
+ <translation>?????</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncresult.cpp" line="139"/>
+ <source>%1: %2</source>
+ <extracomment>this displays an error string (%2) for a file %1</extracomment>
+ <translation>%1?%2</translation>
+ </message>
<message>
<location filename="../src/gui/foldercreationdialog.cpp" line="41"/>
<source>New folder</source>
@@ -6129,57 +6288,12 @@
<source>Synced %1</source>
<translation>??? %1</translation>
</message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="440"/>
- <source>%nd</source>
- <comment>delay in days after an activity</comment>
- <translation><numerusform>%n ?</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="444"/>
- <source>in the future</source>
- <translation>???</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="449"/>
- <source>%nh</source>
- <comment>delay in hours after an activity</comment>
- <translation><numerusform>%n ??</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="455"/>
- <source>now</source>
- <translation>??</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="457"/>
- <source>1m</source>
- <comment>one minute after activity date and time</comment>
- <translation>1 ??</translation>
- </message>
- <message numerus="yes">
- <location filename="../src/common/utility.cpp" line="460"/>
- <source>%nm</source>
- <comment>delay in minutes after an activity</comment>
- <translation><numerusform>%n ??</numerusform></translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="464"/>
- <source>Some time ago</source>
- <translation>?????</translation>
- </message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="322"/>
<source>Error deleting the file</source>
<translation>?????????</translation>
</message>
<message>
- <location filename="../src/libsync/syncresult.cpp" line="139"/>
- <source>%1: %2</source>
- <extracomment>this displays an error string (%2) for a file %1</extracomment>
- <translation>%1?%2</translation>
- </message>
- <message>
<location filename="../src/libsync/vfs/cfapi/cfapiwrapper.cpp" line="63"/>
<source>Paths beginning with '#' character are not supported in VFS mode.</source>
<translation>VFS ???????#?????????</translation>
@@ -6425,6 +6539,49 @@
</message>
</context>
<context>
+ <name>TrayFoldersMenuButton</name>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local or group folders</source>
+ <translation>??????????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="66"/>
+ <source>Open local folder</source>
+ <translation>???????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Connected</source>
+ <translation>???</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="95"/>
+ <source>Disconnected</source>
+ <translation>?????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open local folder "%1"</source>
+ <translation>????????%1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="207"/>
+ <source>Open group folder "%1"</source>
+ <translation>????????%1?</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="222"/>
+ <source>Open %1 in file explorer</source>
+ <translation>?????????? %1</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/tray/TrayFoldersMenuButton.qml" line="227"/>
+ <source>User group and local folders menu</source>
+ <translation>?????????????</translation>
+ </message>
+</context>
+<context>
<name>TrayWindowHeader</name>
<message>
<location filename="../src/gui/tray/TrayWindowHeader.qml" line="75"/>
@@ -6614,16 +6771,6 @@
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="109"/>
- <source>%L1 B</source>
- <translation>%L1 B</translation>
- </message>
- <message>
- <location filename="../src/common/utility.cpp" line="116"/>
- <source>%L1 TB</source>
- <translation>%L1 TB</translation>
- </message>
- <message>
<location filename="../src/common/utility.cpp" line="120"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
@@ -6638,6 +6785,16 @@
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="109"/>
+ <source>%L1 B</source>
+ <translation>%L1 B</translation>
+ </message>
+ <message>
+ <location filename="../src/common/utility.cpp" line="116"/>
+ <source>%L1 TB</source>
+ <translation>%L1 TB</translation>
+ </message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="299"/>
<source>%n year(s)</source>
@@ -6871,16 +7028,16 @@
<translation>???????</translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="123"/>
- <source>Preparing to sync</source>
- <translation>??????</translation>
- </message>
- <message>
<location filename="../src/libsync/theme.cpp" line="126"/>
<source>Stopping sync</source>
<translation>??????</translation>
</message>
<message>
+ <location filename="../src/libsync/theme.cpp" line="123"/>
+ <source>Preparing to sync</source>
+ <translation>??????</translation>
+ </message>
+ <message>
<location filename="../src/libsync/theme.cpp" line="129"/>
<source>Sync is paused</source>
<translation>?????</translation>
@@ -6939,4 +7096,17 @@
<translation>??????</translation>
</message>
</context>
+<context>
+ <name>FileProviderFastEnumerationSettings</name>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="37"/>
+ <source>Enable fast sync</source>
+ <translation>??????</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/macOS/ui/FileProviderFastEnumerationSettings.qml" line="52"/>
+ <source>Fast sync will only sync changes in files and folders within folders that have been explored. This can significantly increase responsiveness on initial configuration of virtual files. However, it will cause redundant downloads of files moved to an unexplored folder. </source>
+ <translation>??????????????????????????????????????????????????????????????????????????</translation>
+ </message>
+</context>
</TS>
\ No newline at end of file
diff -Nru nextcloud-desktop-3.16.4/VERSION.cmake nextcloud-desktop-3.16.6/VERSION.cmake
--- nextcloud-desktop-3.16.4/VERSION.cmake 2025-04-28 12:10:35.000000000 +0200
+++ nextcloud-desktop-3.16.6/VERSION.cmake 2025-06-18 22:57:35.000000000 +0200
@@ -3,10 +3,12 @@
# ------------------------------------
set(MIRALL_VERSION_MAJOR 3)
set(MIRALL_VERSION_MINOR 16)
-set(MIRALL_VERSION_PATCH 4)
+set(MIRALL_VERSION_PATCH 6)
set(MIRALL_VERSION_YEAR 2025)
set(MIRALL_SOVERSION 0)
-set(MIRALL_PREVERSION_HUMAN "3.16.4") # For preversions where PATCH>=50. Use version + alpha, rc1, rc2, etc.
+set(MIRALL_PREVERSION_HUMAN "3.16.6") # For preversions where PATCH>=50. Use version + alpha, rc1, rc2, etc.
+set(NCEXT_BUILD_NUM 47)
+set(NCEXT_VERSION 3,0,0,${NCEXT_BUILD_NUM})
# ------------------------------------
# Minimum supported server versions
More information about the Pkg-owncloud-maintainers
mailing list